diff --git a/.gitignore b/.gitignore index ed59847247be44bbe5ecb45d88545eec884eaa24..382dac6d445b61c2891663e679c5efbce428a87c 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 fbfdf903ea1e3b298e53d4ac1e00343f1e08280e..1b2adf6036e71852c82b897efb20b734309ccdec 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 58c1e5e8f09a25b730297a8a5b4520a7419312e8..bc0dc1875165ec94b506d9b4a5525fd946feaea8 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