From daabd302b459b91e5ce27c565942d8210f4f6f1b Mon Sep 17 00:00:00 2001 From: George Sedov <george.sedov@desy.de> Date: Mon, 16 May 2022 17:43:33 +0200 Subject: [PATCH] add fluentd-elastic container --- .gitlab-ci.yml | 1 + .../fluentd_elastic/Dockerfile | 20 +++++++++++++++++++ .../gitlab-ci-build-docker.yml | 16 +++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 deploy/secondary_services/fluentd_elastic/Dockerfile create mode 100644 deploy/secondary_services/fluentd_elastic/gitlab-ci-build-docker.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4917418bd..f0937ff92 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ include: - local: deploy/build_env/centos/gitlab-ci-build-docker.yml - local: deploy/build_env/debians/gitlab-ci-build-docker.yml - local: deploy/build_env/ubuntu/gitlab-ci-build-docker.yml + - local: deploy/secondary_services/fluentd_elastic/gitlab-ci-build-docker.yml .go-cache: variables: diff --git a/deploy/secondary_services/fluentd_elastic/Dockerfile b/deploy/secondary_services/fluentd_elastic/Dockerfile new file mode 100644 index 000000000..a62a8ad0d --- /dev/null +++ b/deploy/secondary_services/fluentd_elastic/Dockerfile @@ -0,0 +1,20 @@ +FROM fluent/fluentd:v1.7.3-debian-1.0 + +# Use root account to use apt +USER root + +# below RUN includes plugin as examples elasticsearch is not required +# you may customize including plugins as you wish +RUN buildDeps="sudo make gcc g++ libc-dev" \ + && apt-get update \ + && apt-get install -y --no-install-recommends $buildDeps \ + && sudo gem install fluent-plugin-elasticsearch \ + && sudo gem sources --clear-all \ + && SUDO_FORCE_REMOVE=yes \ + apt-get purge -y --auto-remove \ + -o APT::AutoRemove::RecommendsImportant=false \ + $buildDeps \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem + +USER fluent diff --git a/deploy/secondary_services/fluentd_elastic/gitlab-ci-build-docker.yml b/deploy/secondary_services/fluentd_elastic/gitlab-ci-build-docker.yml new file mode 100644 index 000000000..069f6e17c --- /dev/null +++ b/deploy/secondary_services/fluentd_elastic/gitlab-ci-build-docker.yml @@ -0,0 +1,16 @@ +docker-create-asapo-secondary-fluentd-elasticsearch: + image: + name: gcr.io/kaniko-project/executor:debug + entrypoint: [""] + stage: .pre + script: + - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json + - /kaniko/executor --cache=false --context $CI_PROJECT_DIR/deploy/secondary_services/fluentd_elastic --dockerfile $CI_PROJECT_DIR/deploy/secondary_services/fluentd_elastic/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-secondary-fluentd-elasticsearch:${CI_COMMIT_SHORT_SHA} --destination $CI_REGISTRY_IMAGE/asapo-secondary-fluentd-elasticsearch:latest + tags: + - kubernetes-executor + rules: + - changes: + - deploy/secondary_services/fluentd_elastic/Dockerfile + when: always + - when: never + -- GitLab