diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e30760..e3cfa8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,19 +1,22 @@ 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 pull git.bitstorm.ca/bitforge/warehouse13:latest + - buidah tag git.bitstorm.ca/bitforge/warehouse13:latest $IMAGE_NAME + - buildah push --storage-driver vfs $IMAGE_NAME deploy_helm_charts: stage: deploy @@ -34,4 +37,4 @@ deploy_helm_charts: script: - kubectl config use-context $CONTEXT - | - helm upgrade --install warehouse13-$CI_COMMIT_REF_NAME ./helm/warehouse13 --namespace $NAMESPACE -f $VALUES_FILE \ No newline at end of file + helm upgrade --install warehouse13-dev ./helm/warehouse13 --namespace $NAMESPACE -f $VALUES_FILE \ No newline at end of file