From 434b51a9770aa8daaa51d1a4e85b755f3eb45b53 Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Wed, 9 Jun 2021 18:58:40 +0000
Subject: [PATCH] L2SS-259: Attempt at correcting CI paths for docker images
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e27b5dd9..691759b6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,11 +17,11 @@ building:
services:
- docker:dind
variables:
- CHECKOUT_DIR: "$CI_PROJECT_DIR/.."
- TANGO_SKA_LOCAL_DIR: "${CHECKOUT_DIR}"
+# CHECKOUT_DIR: "$CI_PROJECT_DIR/.."
+ TANGO_SKA_LOCAL_DIR: "${CI_PROJECT_DIR}"
TANGO_SKA_CONTAINER_DIR: "/opt/lofar2.0/ska-docker/"
TANGO_SKA_CONTAINER_MOUNT: "${TANGO_SKA_LOCAL_DIR}:${TANGO_SKA_CONTAINER_DIR_DIR}:ro"
- TANGO_LOFAR_LOCAL_DIR: "${CHECKOUT_DIR}/tango/"
+ TANGO_LOFAR_LOCAL_DIR: "${CI_PROJECT_DIR}"
TANGO_LOFAR_CONTAINER_DIR: "/opt/lofar2.0/tango/"
TANGO_LOFAR_CONTAINER_MOUNT: "${TANGO_LOFAR_LOCAL_DIR}:${TANGO_LOFAR_CONTAINER_DIR}:rw"
TANGO_CONTAINER_ENV: "-e TANGO_SKA_CONTAINER_DIR=${TANGO_SKA_CONTAINER_DIR} -e TANGO_LOFAR_CONTAINER_DIR=${TANGO_LOFAR_CONTAINER_DIR}"
--
GitLab