From c209e205abbccb8fcdf3cc89dc6b1cf508a4b75d Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 3 Oct 2021 01:00:19 +0000 Subject: [PATCH 01/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..f7cbe9e --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,49 @@ +# This file is a template, and might need editing before it works on your project. +# To contribute improvements to CI/CD templates, please follow the Development guide at: +# https://docs.gitlab.com/ee/development/cicd/templates.html +# This specific template is located at: +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml + +# This is a sample GitLab CI/CD configuration file that should run without any modifications. +# It demonstrates a basic 3 stage CI/CD pipeline. Instead of real tests or scripts, +# it uses echo commands to simulate the pipeline execution. +# +# A pipeline is composed of independent jobs that run scripts, grouped into stages. +# Stages run in sequential order, but jobs within stages run in parallel. +# +# For more information, see: https://docs.gitlab.com/ee/ci/yaml/index.html#stages + +stages: # List of stages for jobs, and their order of execution + - build + - test + - deploy + +build-job: # This job runs in the build stage, which runs first. + stage: build + script: + - echo "Compiling the code..." + - docker-config + - docker buildx build --no-cache -f Dockerfile-proxy -t hacknix/freedmr:development-latest -t hacknix/freedmr:latest -t hacknix/freedmr:v1.2.12-with-proxy --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . + + + - echo "Compile complete." + +unit-test-job: # This job runs in the test stage. + stage: test # It only starts when the job in the build stage completes successfully. + script: + - echo "Running unit tests... This will take about 60 seconds." + - sleep 60 + - echo "Code coverage is 90%" + +lint-test-job: # This job also runs in the test stage. + stage: test # It can run at the same time as unit-test-job (in parallel). + script: + - echo "Linting code... This will take about 10 seconds." + - sleep 10 + - echo "No lint issues found." + +deploy-job: # This job runs in the deploy stage. + stage: deploy # It only runs when *both* jobs in the test stage complete successfully. + script: + - echo "Deploying application..." + - echo "Application successfully deployed." From 6e5f38ab423aa757c3cd9a629a35f1e065087574 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 3 Oct 2021 01:02:11 +0000 Subject: [PATCH 02/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7cbe9e..cb9d535 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ build-job: # This job runs in the build stage, which runs first. script: - echo "Compiling the code..." - docker-config - - docker buildx build --no-cache -f Dockerfile-proxy -t hacknix/freedmr:development-latest -t hacknix/freedmr:latest -t hacknix/freedmr:v1.2.12-with-proxy --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . + - docker buildx build --no-cache -f Dockerfile-proxy -t hacknix/freedmr:development-latest --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . - echo "Compile complete." From d000927cb26a308fce9292ee09b49a10a6bdd9ee Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 3 Oct 2021 01:09:55 +0000 Subject: [PATCH 03/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb9d535..279229f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ build-job: # This job runs in the build stage, which runs first. stage: build script: - echo "Compiling the code..." - - docker-config + - cd docker-config - docker buildx build --no-cache -f Dockerfile-proxy -t hacknix/freedmr:development-latest --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . From 31a8cdffa50c9849e2a02319ee3afe12f41d5907 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 3 Oct 2021 01:13:34 +0000 Subject: [PATCH 04/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 279229f..7850953 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ build-job: # This job runs in the build stage, which runs first. stage: build script: - echo "Compiling the code..." - - cd docker-config + - cd docker-configs - docker buildx build --no-cache -f Dockerfile-proxy -t hacknix/freedmr:development-latest --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . From 541f8fb721c5f97d914f2e62032aa9a11f477e4a Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 3 Oct 2021 01:15:03 +0000 Subject: [PATCH 05/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7850953..2587891 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ build-job: # This job runs in the build stage, which runs first. script: - echo "Compiling the code..." - cd docker-configs - - docker buildx build --no-cache -f Dockerfile-proxy -t hacknix/freedmr:development-latest --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . + - docker buildx -f Dockerfile-proxy -t hacknix/freedmr:development-latest --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . - echo "Compile complete." From e07f3fc4e1bc27a49624c99dccf7dc87d767d4f8 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 3 Oct 2021 01:17:31 +0000 Subject: [PATCH 06/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2587891..807449c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,8 @@ build-job: # This job runs in the build stage, which runs first. script: - echo "Compiling the code..." - cd docker-configs - - docker buildx -f Dockerfile-proxy -t hacknix/freedmr:development-latest --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . + - docker buildx build --no-cache -f Dockerfile-proxy -t hacknix/freedmr:development-latest -t hacknix/freedmr:latest -t hacknix/freedmr:v1.2.12-with-proxy --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . + - echo "Compile complete." From 00761187e7fae4b459a9964f5832320d05cface1 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 4 Oct 2021 17:17:12 +0000 Subject: [PATCH 07/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 807449c..59475d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,8 @@ stages: # List of stages for jobs, and their order of execution build-job: # This job runs in the build stage, which runs first. stage: build + tags: + - buildx script: - echo "Compiling the code..." - cd docker-configs From ab4df646350bb99644e189a5800bae5b348aa19e Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 4 Oct 2021 17:27:22 +0000 Subject: [PATCH 08/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59475d6..a7420fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,28 +25,8 @@ build-job: # This job runs in the build stage, which runs first. script: - echo "Compiling the code..." - cd docker-configs - - docker buildx build --no-cache -f Dockerfile-proxy -t hacknix/freedmr:development-latest -t hacknix/freedmr:latest -t hacknix/freedmr:v1.2.12-with-proxy --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . + - docker buildx build --no-cache -f Dockerfile-proxy -t hacknix/freedmr:development-latest --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . - echo "Compile complete." - -unit-test-job: # This job runs in the test stage. - stage: test # It only starts when the job in the build stage completes successfully. - script: - - echo "Running unit tests... This will take about 60 seconds." - - sleep 60 - - echo "Code coverage is 90%" - -lint-test-job: # This job also runs in the test stage. - stage: test # It can run at the same time as unit-test-job (in parallel). - script: - - echo "Linting code... This will take about 10 seconds." - - sleep 10 - - echo "No lint issues found." - -deploy-job: # This job runs in the deploy stage. - stage: deploy # It only runs when *both* jobs in the test stage complete successfully. - script: - - echo "Deploying application..." - - echo "Application successfully deployed." From 69129b703e79a50f1bb7ed191a4240e770f1028d Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 4 Oct 2021 18:11:03 +0000 Subject: [PATCH 09/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7420fd..6c9000c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,10 +15,8 @@ stages: # List of stages for jobs, and their order of execution - build - - test - - deploy -build-job: # This job runs in the build stage, which runs first. +build-dev: # This job runs in the build stage, which runs first. stage: build tags: - buildx @@ -30,3 +28,21 @@ build-job: # This job runs in the build stage, which runs first. - echo "Compile complete." + only: + - master + +build-release: # This job runs in the build stage, which runs first. + stage: build + tags: + - buildx + script: + - echo "Compiling the code..." + - cd docker-configs + - docker buildx build --no-cache -f Dockerfile-proxy -t hacknix/freedmr:latest -t hacknix/$CI_COMMIT_TAG-with-proxy -t hacknix/freedmr:development-latest --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . + + + + - echo "Compile complete." + only: + - master + - tags From 3dfb427be6e42217d8b318dfcca735bb0d7430d5 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 4 Oct 2021 18:28:50 +0000 Subject: [PATCH 10/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c9000c..b843602 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,5 +44,4 @@ build-release: # This job runs in the build stage, which runs first. - echo "Compile complete." only: - - master - tags