diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37658d3..fef0958 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,20 +1,19 @@ stages: - - build - deploy -build_container: - stage: build - image: deps.global.bsf.tools/quay.io/buildah/stable:latest - variables: - IMAGE_NAME: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" - before_script: - - mkdir -p /tmp/buildah-storage - - export BUILDAH_ROOT="/tmp/buildah-storage" - - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY" - script: - - buildah bud --build-arg NPM_REGISTRY=https://deps.global.bsf.tools/artifactory/api/npm/registry.npmjs.org/ --storage-driver vfs --isolation chroot -t $IMAGE_NAME . - - buildah push --storage-driver vfs $IMAGE_NAME +# build_container: +# stage: build +# image: deps.global.bsf.tools/quay.io/buildah/stable:latest +# variables: +# IMAGE_NAME: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" +# before_script: +# - mkdir -p /tmp/buildah-storage +# - export BUILDAH_ROOT="/tmp/buildah-storage" +# - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY" +# script: +# - buildah bud --build-arg NPM_REGISTRY=https://deps.global.bsf.tools/artifactory/api/npm/registry.npmjs.org/ --storage-driver vfs --isolation chroot -t $IMAGE_NAME . +# - buildah push --storage-driver vfs $IMAGE_NAME deploy_helm_charts: stage: deploy @@ -38,8 +37,8 @@ deploy_helm_charts: helm upgrade --install warehouse13-$CI_COMMIT_REF_NAME \ ./helm/warehouse13 --namespace $NAMESPACE \ -f $VALUES_FILE \ - --set api.image=$CI_REGISTRY_IMAGE \ - --set api.image.tag=$CI_COMMIT_REF_NAME \ + --set api.image=registry.global.bsf.tools/esv/bsf/bsf-services/warehouse13 \ + --set api.image.tag=main-7126c618 \ --set postgres.image.repository=containers.global.bsf.tools/postgres \ --set postgres.image.tag=15-alpine \ --set minio.image.repository=containers.global.bsf.tools/minio \