From da274d3c66d952ff13b2ad4b16a9d8a3af74f60f Mon Sep 17 00:00:00 2001
From: Darren Clarke <darren@redaranj.com>
Date: Tue, 20 Jun 2023 08:39:14 +0000
Subject: [PATCH] CI updates #2

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0cd5eeb..c4d81dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,11 +18,11 @@ build-all:
     - docker:dind
   stage: docker-build
   variables:
-    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/$(basename "${PWD}")
     DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
+    DOCKER_CONTEXT: .
   script:
     - 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} ${PWD}
+    - DOCKER_BUILDKIT=1 docker build --pull --no-cache -t ${DOCKER_NS}:${DOCKER_TAG} -f ${DOCKERFILE_PATH} ${DOCKER_CONTEXT}
     - docker push
 
 .docker-release:
@@ -31,7 +31,6 @@ build-all:
     - docker:dind
   stage: docker-release
   variables:
-    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/$(basename "${PWD}")
     DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
     DOCKER_TAG_NEW: ${CI_COMMIT_REF_NAME}-$(shell jq -r '.version' package.json)
   only:
@@ -49,6 +48,7 @@ link-docker-build:
     - cd apps/link
   variables:
     DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/link
+    DOCKERFILE_PATH: apps/link/Dockerfile
 
 link-docker-release:
   extends: .docker-release