From 2ef036dce65a8f9efb0db7791b16166e0412ed96 Mon Sep 17 00:00:00 2001 From: Carolin Dohmen Date: Tue, 18 Dec 2018 09:51:41 +0100 Subject: [PATCH 1/3] Add .gitlab-ci.yml --- .gitlab-ci.yml | 26 ++++++++++++++++++++++++++ ci/docker/festung/Dockerfile | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..741700d --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,26 @@ +stages: + - deliver-steinmetz + - deliver-festung + +build-and-push-steinmetz: + stage: deliver-steinmetz + image: registry.gitlab.figo.systems/platform/docker-builder + services: + - docker:18-dind + script: + - build-and-push -f ci/docker/steinmetz/Dockerfile -i steinmetz --tag $(git-semver -no-hash) + only: + changes: + - stack.yaml + - package.yaml + +build-and-push-festung: + stage: deliver-festung + image: registry.gitlab.figo.systems/platform/docker-builder + services: + - docker:18-dind + script: + - build-and-push -f ci/docker/festung/Dockerfile -i festung --tag $(git-semver -no-hash) + only: + refs: + - tags diff --git a/ci/docker/festung/Dockerfile b/ci/docker/festung/Dockerfile index 10775d7..b3f2783 100644 --- a/ci/docker/festung/Dockerfile +++ b/ci/docker/festung/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/figo/steinmetz as builder +FROM registry.gitlab.figo.systems/solutions/festung as builder WORKDIR /tmp/build COPY stack.yaml package.yaml README.md LICENSE Setup.hs ./ COPY src src/ From d3fa3d1cbd9e25a4fdfe1fab65d48b5f32b3d73a Mon Sep 17 00:00:00 2001 From: Martin Domke Date: Tue, 18 Dec 2018 11:49:33 +0100 Subject: [PATCH 2/3] chore: Remove old CI files --- .gitlab-ci.yml | 4 +- ci/credentials.yml.asc | 142 ------------------ ci/pipeline.yml | 55 ------- ci/vars.yml | 3 - {ci/docker => docker}/festung/Dockerfile | 0 .../festung/Dockerfile.centos | 0 {ci/docker => docker}/steinmetz/Dockerfile | 0 .../steinmetz/Dockerfile.centos | 0 8 files changed, 2 insertions(+), 202 deletions(-) delete mode 100644 ci/credentials.yml.asc delete mode 100644 ci/pipeline.yml delete mode 100644 ci/vars.yml rename {ci/docker => docker}/festung/Dockerfile (100%) rename {ci/docker => docker}/festung/Dockerfile.centos (100%) rename {ci/docker => docker}/steinmetz/Dockerfile (100%) rename {ci/docker => docker}/steinmetz/Dockerfile.centos (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 741700d..eb10c1f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ build-and-push-steinmetz: services: - docker:18-dind script: - - build-and-push -f ci/docker/steinmetz/Dockerfile -i steinmetz --tag $(git-semver -no-hash) + - build-and-push -f docker/steinmetz/Dockerfile -i steinmetz --tag $(git-semver -no-hash) only: changes: - stack.yaml @@ -20,7 +20,7 @@ build-and-push-festung: services: - docker:18-dind script: - - build-and-push -f ci/docker/festung/Dockerfile -i festung --tag $(git-semver -no-hash) + - build-and-push -f docker/festung/Dockerfile -i festung --tag $(git-semver -no-hash) only: refs: - tags diff --git a/ci/credentials.yml.asc b/ci/credentials.yml.asc deleted file mode 100644 index fcd8be0..0000000 --- a/ci/credentials.yml.asc +++ /dev/null @@ -1,142 +0,0 @@ ------BEGIN PGP MESSAGE----- - -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 -=5XWz ------END PGP MESSAGE----- diff --git a/ci/pipeline.yml b/ci/pipeline.yml deleted file mode 100644 index 4b9074d..0000000 --- a/ci/pipeline.yml +++ /dev/null @@ -1,55 +0,0 @@ -resources: -- name: repo - type: git - source: &repo-source - uri: git@github.com:figome/festung.git - branch: master - private_key: ((github-key)) - -- name: deps - type: git - source: - <<: *repo-source - paths: - - stack.yaml - -- name: festung - type: docker-image - source: ®istry-source - username: ((docker-registry-username)) - password: ((docker-registry-password)) - email: ci@figo.io - repository: ((docker-registry))/((docker-registry-project))/festung - -- name: steinmetz - type: docker-image - source: - <<: *registry-source - repository: ((docker-registry))/((docker-registry-project))/steinmetz - - -jobs: -- name: build-steinmetz - public: true - plan: - - get: repo - trigger: false - - get: deps - trigger: true - - put: steinmetz - params: - build: repo - dockerfile: repo/ci/docker/steinmetz/Dockerfile - -- name: build-festung - public: true - plan: - - get: repo - trigger: true - - get: steinmetz - passed: [build-steinmetz] - trigger: false - - put: festung - params: - build: repo - dockerfile: repo/ci/docker/festung/Dockerfile diff --git a/ci/vars.yml b/ci/vars.yml deleted file mode 100644 index f82bf1b..0000000 --- a/ci/vars.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker-registry: quay.io -docker-registry-project: figo diff --git a/ci/docker/festung/Dockerfile b/docker/festung/Dockerfile similarity index 100% rename from ci/docker/festung/Dockerfile rename to docker/festung/Dockerfile diff --git a/ci/docker/festung/Dockerfile.centos b/docker/festung/Dockerfile.centos similarity index 100% rename from ci/docker/festung/Dockerfile.centos rename to docker/festung/Dockerfile.centos diff --git a/ci/docker/steinmetz/Dockerfile b/docker/steinmetz/Dockerfile similarity index 100% rename from ci/docker/steinmetz/Dockerfile rename to docker/steinmetz/Dockerfile diff --git a/ci/docker/steinmetz/Dockerfile.centos b/docker/steinmetz/Dockerfile.centos similarity index 100% rename from ci/docker/steinmetz/Dockerfile.centos rename to docker/steinmetz/Dockerfile.centos From bde9ebf71a50cdc922f6abffa4d23a7f6c936be8 Mon Sep 17 00:00:00 2001 From: Martin Domke Date: Tue, 18 Dec 2018 11:50:06 +0100 Subject: [PATCH 3/3] Use versioned docker-builder images --- .gitlab-ci.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb10c1f..52f6d01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,10 @@ stages: - - deliver-steinmetz - - deliver-festung + - prepare + - deliver -build-and-push-steinmetz: - stage: deliver-steinmetz - image: registry.gitlab.figo.systems/platform/docker-builder +build-steinmetz: + stage: prepare + image: registry.gitlab.figo.systems/platform/docker-builder:1.2 services: - docker:18-dind script: @@ -14,9 +14,9 @@ build-and-push-steinmetz: - stack.yaml - package.yaml -build-and-push-festung: - stage: deliver-festung - image: registry.gitlab.figo.systems/platform/docker-builder +build-festung: + stage: deliver + image: registry.gitlab.figo.systems/platform/docker-builder:1.2 services: - docker:18-dind script: @@ -24,3 +24,5 @@ build-and-push-festung: only: refs: - tags + - develop + - feature/create-gitlab-ci-pipeline