From 4fffb4cf43d00081cf2c189a537ab02373fc3431 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <steffen.vogel@opal-rt.com>
Date: Tue, 2 May 2023 13:27:32 +0200
Subject: [PATCH] ci: cleanup config

Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
---
 .gitlab-ci.yml | 45 ++++++++++++++-------------------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95c94c8..af59b81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,6 @@
 variables:
   GIT_SUBMODULE_STRATEGY: normal
   DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}
-  FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
-
-#cache:
-#  untracked: true
-#  key: ${CI_PROJECT_ID}
-#  paths:
-#    - node_modules/
-#    - _site/vendor/
-#    - .bundled/
-#    - .yarn
 
 stages:
   - build
@@ -19,36 +9,29 @@ stages:
 build.npm:
   stage: build
   image: node:16.5
+  variables:
+    CI: "false"
   before_script:
-    - mkdir -p build
+  - mkdir -p build
   script:
-    - npm install --force
-    - CI=false npm run build
-#  artifacts:
-#    paths:
-#      - build/
-#    expire_in: 1 week
+  - npm install --force
+  - npm run build
 
 deploy.default:
   stage: deploy
   image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [ "" ]
+    name: docker
   variables:
     BRANDING: villasweb
     DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
+  before_script:
+  - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
   script:
-    - mkdir -p /kaniko/.docker
-    - echo "{\"auths\":{\"${CI_REGISTRY}\":{\"username\":\"${CI_REGISTRY_USER}\",\"password\":\"${CI_REGISTRY_PASSWORD}\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor
-      --context ${CI_PROJECT_DIR}
-      --build-arg REACT_APP_BRAND=${BRANDING}
-      --dockerfile ${CI_PROJECT_DIR}/Dockerfile
-      --destination ${DOCKER_IMAGE}:${DOCKER_TAG}
-      --snapshotMode=redo
-      --single-snapshot
+  - docker build --build-arg REACT_APP_BRAND=${BRANDING} --tag ${DOCKER_IMAGE}:${DOCKER_TAG} .
   dependencies:
-    - build.npm
+  - build.npm
+  tags:
+  - docker
 
 deploy.slew:
   variables:
@@ -56,7 +39,7 @@ deploy.slew:
     DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
   extends: deploy.default
 
-# deploy latest tag on master branch
+# Deploy latest tag on master branch
 deploy.latest:
   variables:
     BRANDING: villasweb
@@ -64,4 +47,4 @@ deploy.latest:
   extends: deploy.default
   only:
     refs:
-      - master
+    - master