From 8bbb0636435c0f1e6482dd5a3155b324ef08e176 Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Wed, 6 Nov 2024 11:01:11 +0100 Subject: [PATCH] Hotfix docker --- .gitlab-ci.yml | 4 ++-- make/rel.mk | 2 -- sonar-project.properties | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 024bab42ef..f87b4978cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -415,9 +415,9 @@ release-docs: refs: - /^release-.*/ before_script: - - "apk add --update alpine-sdk bash sed wget openssh jq curl" - "pip install pipenv" - - "pip install -r ./requirements.txt" + - "pipenv install --dev --system --deploy + - "apk add --no-cache alpine-sdk bash sed wget openssh jq curl" - "mkdir -p ./final/${DOC_VERSION}/rest" script: - "make gen-lib-doc gen-docs-doc package-config" diff --git a/make/rel.mk b/make/rel.mk index f32f34dc22..6a24d75a90 100644 --- a/make/rel.mk +++ b/make/rel.mk @@ -8,7 +8,6 @@ tag-images: build-images ## Tag the docker images. docker tag dbrepo-data-service:latest "${REPOSITORY_URL}/data-service:${APP_VERSION}" docker tag dbrepo-metadata-service:latest "${REPOSITORY_URL}/metadata-service:${APP_VERSION}" docker tag dbrepo-search-db:latest "${REPOSITORY_URL}/search-db:${APP_VERSION}" - docker tag dbrepo-data-db-sidecar:latest "${REPOSITORY_URL}/data-db-sidecar:${APP_VERSION}" docker tag dbrepo-search-service:latest "${REPOSITORY_URL}/search-service:${APP_VERSION}" docker tag dbrepo-search-service-init:latest "${REPOSITORY_URL}/search-service-init:${APP_VERSION}" docker tag dbrepo-storage-service-init:latest "${REPOSITORY_URL}/storage-service-init:${APP_VERSION}" @@ -20,7 +19,6 @@ release-images: tag-images ## Release the docker images. docker push "${REPOSITORY_URL}/ui:${APP_VERSION}" docker push "${REPOSITORY_URL}/data-service:${APP_VERSION}" docker push "${REPOSITORY_URL}/search-db:${APP_VERSION}" - docker push "${REPOSITORY_URL}/data-db-sidecar:${APP_VERSION}" docker push "${REPOSITORY_URL}/metadata-service:${APP_VERSION}" docker push "${REPOSITORY_URL}/search-service:${APP_VERSION}" docker push "${REPOSITORY_URL}/search-service-init:${APP_VERSION}" diff --git a/sonar-project.properties b/sonar-project.properties index 528f5fddc2..ff8f65d347 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,6 +1,6 @@ # sonarqube sonar.projectKey=fair-data-austria-db-repository_fda-services_a57fa043-ab99-4cdd-a721-162d9a916d77 -sonar.host.url=https://s34.datalab.tuwien.ac.at +sonar.host.url=https://s39.datalab.tuwien.ac.at # project sonar.projectVersion=1.5.0 # general -- GitLab