From 065dedc7b2b67a815a622418f64839a60cceb9a5 Mon Sep 17 00:00:00 2001
From: Darren Clarke <darren@redaranj.com>
Date: Tue, 20 Jun 2023 08:58:48 +0000
Subject: [PATCH] CI updates #3

---
 .gitlab-ci.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4d81dd..eaaaeea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,9 @@ stages:
 
 build-all:
   stage: build
+  variables:
+    TURBO_TOKEN: $TURBO_TOKEN
+    TURBO_TEAM: $TURBO_TEAM
   script:
     - npm install -g turbo
     - npm ci
@@ -20,6 +23,9 @@ build-all:
   variables:
     DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
     DOCKER_CONTEXT: .
+  only:
+    - main
+    - develop
   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} -f ${DOCKERFILE_PATH} ${DOCKER_CONTEXT}
@@ -44,20 +50,11 @@ build-all:
 
 link-docker-build:
   extends: .docker-build
-  before_script:
-    - cd apps/link
   variables:
     DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/link
-    DOCKERFILE_PATH: apps/link/Dockerfile
+    DOCKERFILE_PATH: ./apps/link/Dockerfile
 
 link-docker-release:
   extends: .docker-release
-  before_script:
-    - cd apps/link
   variables:
     DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/link
-
-cache:
-  key: ${CI_COMMIT_REF_SLUG}
-  paths:
-    - .turbo/