diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db57f8e..b8e021a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,10 @@ stages: variables: DIST_DIR: "./src/.vitepress/dist" + DMZ_DIST_DIR: "./dmz-dist" CONTAINER_REGISTRY: harbor.vimpelcom.ru PRODUCT_PROD: vega/beecloud + PRODUCT_DMZ: vega/beecloud/dmz IMAGE_NAME: docs-portal include: diff --git a/ci/develop.yml b/ci/develop.yml index c4d8f6d..9a4a9c9 100644 --- a/ci/develop.yml +++ b/ci/develop.yml @@ -15,12 +15,15 @@ develop:npm: - export PRODUCT_VERSION=$(node -p "require('./package.json').version") - echo PRODUCT_VERSION="$PRODUCT_VERSION" >> .env - echo PRODUCT="$PRODUCT_PROD" >> .env - - export VITE_NEW_VERSION="true" - npm install - npm run build + - export VITE_NEW_VERSION="true" + - echo "$DMZ_DIST_DIR" + - ./node_modules/.bin/vitepress build src --outDir "$DMZ_DIST_DIR" artifacts: paths: - "$DIST_DIR" + - "$DMZ_DIST_DIR" reports: dotenv: .env expire_in: 1h @@ -39,6 +42,9 @@ build-image-npm: - docker build --build-arg DIST_DIR=${DIST_DIR} -f ./build.Dockerfile -t ${CONTAINER_REGISTRY}/${PRODUCT}/${IMAGE_NAME}:$PRODUCT_VERSION -t ${CONTAINER_REGISTRY}/${PRODUCT}/${IMAGE_NAME}:latest . - docker push ${CONTAINER_REGISTRY}/${PRODUCT}/${IMAGE_NAME}:$PRODUCT_VERSION - docker push ${CONTAINER_REGISTRY}/${PRODUCT}/${IMAGE_NAME}:latest + - docker build --build-arg DIST_DIR=${DMZ_DIST_DIR} --build-arg WROOT_DIR="/usr/share/nginx/html" -f ./build.Dockerfile -t ${CONTAINER_REGISTRY}/${PRODUCT_DMZ}/${IMAGE_NAME}:$PRODUCT_VERSION -t ${CONTAINER_REGISTRY}/${PRODUCT_DMZ}/${IMAGE_NAME}:latest . + - docker push ${CONTAINER_REGISTRY}/${PRODUCT_DMZ}/${IMAGE_NAME}:$PRODUCT_VERSION + - docker push ${CONTAINER_REGISTRY}/${PRODUCT_DMZ}/${IMAGE_NAME}:latest needs: - job: develop:npm artifacts: true diff --git a/package.json b/package.json index b3a8cf2..387d06c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "docs", - "version": "0.6.0", + "version": "0.6.1", "description": "Vega docs portal", "main": "index.js", "scripts": {