From b2789674177b7f86ad57c8ab4202ad3ef691f5d5 Mon Sep 17 00:00:00 2001
From: Marco Zeisler <marco.zeisler@kapsch.net>
Date: Tue, 11 May 2021 19:08:50 +0200
Subject: [PATCH] swtich to docker build

---
 .gitlab-ci.yml | 92 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 60 insertions(+), 32 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9bf512..2c63ca8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,19 +2,13 @@ stages:
   - build
   - lint
   - test
-  - compose-build
-  - compose-push
+  - docker-build
+  - docker-push
 
-.lint:
-  stage: lint
-.build:
-  stage: build
-.test:
-  stage: test
-.compose-build:
-  stage: compose-build
-.compose-push:
-  stage: compose-push
+.python-image:
+  image: python:3.8-slim
+.angular-image:
+  image: johnpapa/angular-cli
 
 ########
 # BUILD
@@ -26,9 +20,10 @@ stages:
 #    - echo ''
 #  extends:
 #    - .build
+.build:
+  stage: build
 
 build_be:
-  image: python:3.8-slim
   before_script:
     - apt-get update
     - apt-get install -y build-essential gcc
@@ -41,19 +36,24 @@ build_be:
     untracked: true
   extends:
     - .build
+    - .python-image
 
 ########
 # LINT
 #################################################################
+.lint:
+  stage: lint
 
 lint_fe:
-  image: johnpapa/angular-cli
   script:
     - cd ./frontend
     - npm install
-    - npm run -- ng lint
+    - ng lint
   extends:
     - .lint
+    - .angular-image
+  artifacts:
+    untracked: true
 #  needs:
 #    - build_fe
 
@@ -68,45 +68,73 @@ lint_fe:
 ########
 # TEST
 #################################################################
+.test:
+  stage: test
 
 test_fe:
   script:
-    - echo ''
+    - ng test
   extends:
     - .test
+    - .angular-image
   needs:
     - lint_fe
 
-test_be:
+#test_be:
+#  script:
+#    - cd ./backend
+#    - ls -l
+#  extends:
+#    - .test
+#  needs:
+#    - build_be
+
+########
+# DOCKER-BUILD
+#################################################################
+.docker-build:
+  stage: docker-build
+
+.docker-setup:
+  before_script:
+    - echo $DOCKER_PW | docker login -u $DOCKER_USER --password-stdin
+
+docker-build-fe:
   script:
-    - cd ./backend
-    - ls -l
+    - echo ""
   extends:
-    - .test
+    - .docker-build
+    - .docker-setup
+  needs:
+    - test_fe
+
+docker-build-be:
+  script:
+    - echo ""
+  extends:
+    - .docker-build
+    - .docker-setup
   needs:
     - build_be
 
 ########
-# COMPOSE-BUILD
+# DOCKER-PUSH
 #################################################################
+.docker-push:
+  stage: docker-push
 
-compose-build:
+docker-push-fe:
   script:
     - echo ''
   extends:
-    - .compose-build
+    - .docker-push
   needs:
-    - test_be
-    - test_fe
+    - docker-build-fe
 
-########
-# COMPOSE-PUSH
-#################################################################
-
-compose-push:
+docker-push-be:
   script:
     - echo ''
   extends:
-    - .compose-push
+    - .docker-push
   needs:
-    - compose-build
+    - docker-build-be