From 776c69f80b8355848494d76f59b8598a20bdb1f5 Mon Sep 17 00:00:00 2001
From: Frank Agerholm <frank@agerholm.de>
Date: Tue, 11 Jul 2023 15:44:33 +0000
Subject: [PATCH] Test- and Deploy-Stage for new Images

---
 .gitlab-ci.yml | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index faa52da..106ff0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,18 +10,39 @@ variables:
   DOCKER_HOST: tcp://docker:2376
   DOCKER_TLS_CERTDIR: "/certs"
 before_script:
-- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-build:
-  stage: build
-  script:
-  - docker pull $CI_REGISTRY_IMAGE:latest || true
-  - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-    --tag $CI_REGISTRY_IMAGE:latest .
-  - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-  - docker push $CI_REGISTRY_IMAGE:latest
+- 
+
 stages:
 - build
 - test
+- deploy
+
+build:
+  stage: build
+  before_script:
+  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  script:
+  - docker pull $CI_REGISTRY_IMAGE:latest || true
+  - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:job-$CI_PIPELINE_ID .
+  - docker push $CI_REGISTRY_IMAGE:job-$CI_PIPELINE_ID
+
+test:
+  stage: test
+  image: $CI_REGISTRY_IMAGE:job-$CI_PIPELINE_ID
+  script:
+  - python --version
+  - nikola --version
+  - pip --version
+  - pip freeze
+
+deploy:
+  stage: deploy
+  before_script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  script:
+  - docker tag $CI_REGISTRY_IMAGE:job-$CI_PIPELINE_ID $CI_REGISTRY_IMAGE:latest
+  - docker push $CI_REGISTRY_IMAGE:latest
+
 
 sast:
   stage: test