From 07ee8195209fa0918b5cd8eef49caf0dfba084db Mon Sep 17 00:00:00 2001
From: Darren Clarke <darren@redaranj.com>
Date: Wed, 8 Jan 2025 14:19:41 +0000
Subject: [PATCH] Revert CI to use Gitlab

---
 .gitlab-ci.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90308a9..6ee6093 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,8 +12,8 @@ build-all:
     TURBO_TEAM: ${TURBO_TEAM}
     ZAMMAD_URL: ${ZAMMAD_URL}
   script:
-    # - npm install npm@10 -g
-    # - npm install -g turbo
+    - npm install npm@10 -g
+    - npm install -g turbo
     - npm ci
     - turbo build
 
@@ -30,7 +30,7 @@ build-all:
     - develop
     - tags
   script:
-    - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - DOCKER_BUILDKIT=1 docker build --pull --no-cache -t ${DOCKER_NS}:${DOCKER_TAG} -f ${DOCKERFILE_PATH} ${DOCKER_CONTEXT}
     - docker push ${DOCKER_NS}:${DOCKER_TAG}
 
@@ -47,7 +47,7 @@ build-all:
     - develop
     - tags
   script:
-    - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker pull ${DOCKER_NS}:${DOCKER_TAG}
     - docker tag ${DOCKER_NS}:${DOCKER_TAG} ${DOCKER_NS}:${DOCKER_TAG_NEW}
     - docker push ${DOCKER_NS}:${DOCKER_TAG_NEW}
@@ -201,14 +201,14 @@ zammad-docker-build:
     DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/zammad
     DOCKERFILE_PATH: ./docker/zammad/Dockerfile
     DOCKER_CONTEXT: ./docker/zammad
-  # before_script:
-    # - apk --update add nodejs npm
+  before_script:
+    - apk --update add nodejs npm
   script:
-    # - npm install npm@10 -g
-    # - npm install -g turbo
+    - npm install npm@10 -g
+    - npm install -g turbo
     - npm ci
     - turbo build --force --filter @link-stack/zammad-addon-*
-    - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - DOCKER_BUILDKIT=1 docker build --build-arg EMBEDDED=true --pull --no-cache -t ${DOCKER_NS}:${DOCKER_TAG} -f ${DOCKERFILE_PATH} ${DOCKER_CONTEXT}
     - docker push ${DOCKER_NS}:${DOCKER_TAG}
 
@@ -223,14 +223,14 @@ zammad-standalone-docker-build:
     DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/zammad-standalone
     DOCKERFILE_PATH: ./docker/zammad/Dockerfile
     DOCKER_CONTEXT: ./docker/zammad
-  # before_script:
-  #  - apk --update add nodejs npm
+  before_script:
+    - apk --update add nodejs npm
   script:
-    # - npm install npm@10 -g
-    # - npm install -g turbo
+    - npm install npm@10 -g
+    - npm install -g turbo
     - npm ci
     - turbo build --force --filter @link-stack/zammad-addon-*
-    - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - DOCKER_BUILDKIT=1 docker build --pull --no-cache -t ${DOCKER_NS}:${DOCKER_TAG} -f ${DOCKERFILE_PATH} ${DOCKER_CONTEXT}
     - docker push ${DOCKER_NS}:${DOCKER_TAG}