From b653159e525bb1c63930fe45f24a2c731824496a Mon Sep 17 00:00:00 2001
From: Christian Boettcher <c.boettcher@fz-juelich.de>
Date: Tue, 11 Jan 2022 09:29:56 +0100
Subject: [PATCH] attempt with manual registry setup
---
.gitignore | 1 +
.gitlab-ci.yml | 8 +++++---
requirements.txt | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index ed59847..382dac6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ dockers/.env
.vscode/*
*.pyc
logs/
+.env
# contains data for local tests
.coverage
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbfdf90..1b2adf6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,11 +39,13 @@ build-custom-image:
- docker:dind
when: manual
variables:
- IMAGE_COMMIT_TAG: $CI_REGISTRY_IMAGE/eflows-airflow:$CI_COMMIT_SHORT_SHA
- IMAGE_LATEST_TAG: $CI_REGISTRY_IMAGE/eflows-airflow:latest
+ REGISTRY: registry.jsc.fz-juelich.de
+ REGISTRY_PATH: $REGISTRY/eflows4hpc-wp2/data-logistics-service/eflows-airflow
+ IMAGE_COMMIT_TAG: $REGISTRY_PATH:$CI_COMMIT_SHORT_SHA
+ IMAGE_LATEST_TAG: $REGISTRY_PATH:latest
script:
- - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $REGISTRY
- docker build --no-cache=true --pull -t $IMAGE_COMMIT_TAG -f dockers/eflows-airflow.docker .
- docker push $IMAGE_COMMIT_TAG
- docker tag $IMAGE_COMMIT_TAG $IMAGE_LATEST_TAG
diff --git a/requirements.txt b/requirements.txt
index 58c1e5e..bc0dc18 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,4 @@ apache-airflow-providers-ssh
apache-airflow-providers-http
apache-airflow-providers-sftp
--index-url https://gitlab.jsc.fz-juelich.de/api/v4/projects/4405/packages/pypi/simple
-airflow-datacat-integration>=0.1.0
+airflow-datacat-integration>=0.1.1
--
GitLab