From ac498a51bc12c5b0e93df5a33d4167f53a5d6743 Mon Sep 17 00:00:00 2001 From: Alireza Date: Tue, 6 Jun 2023 15:00:37 -0400 Subject: [PATCH] chore(build): try to buld docker files (#3444) --- .circleci/config.yml | 31 ++++++++++++++++++------------- package.json | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index da2d1fdc3..a4dd7a419 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,17 +18,18 @@ executors: # Custom executor to override Cypress config deploy-to-prod-executor: docker: - - image: cimg/node:16.14 + - image: cimg/node:18.16.0 environment: CYPRESS_BASE_URL: https://ohif-staging.netlify.com/ chrome-and-pacs: docker: # Primary container image where all steps run. - - image: 'cypress/browsers:node16.14.2-slim-chrome103-ff102' + - image: 'cypress/browsers:node18.12.0-chrome103-ff107' + # - image: 'cypress/browsers:node16.14.2-slim-chrome103-ff102' defaults: &defaults docker: - - image: cimg/node:16.14-browsers + - image: cimg/node:18.16.0-browsers environment: TERM: xterm # Enable colors in term QUICK_BUILD: true @@ -302,6 +303,7 @@ jobs: # This file will exist if a new version was published by # our command in the previous job. if [[ ! -e ../version.txt ]]; then + echo "No new version published. Skipping Docker build." exit 0 else # Remove npm config @@ -332,19 +334,22 @@ jobs: # This file will exist if a new version was published by # our command in the previous job. if [[ ! -e ../version.txt ]]; then + echo "No new version published. Skipping Docker build." + # list the directory contents + ls -l exit 0 else # Remove npm config - rm -f ./.npmrc - # Set our version number using vars - export IMAGE_VERSION=$(cat ../version.txt) - export IMAGE_VERSION_FULL=v$IMAGE_VERSION - echo $IMAGE_VERSION - echo $IMAGE_VERSION_FULL - # Build our image, auth, and push - docker build --tag ohif/app:$IMAGE_VERSION_FULL . - echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin - docker push ohif/app:$IMAGE_VERSION_FULL + # rm -f ./.npmrc + # # Set our version number using vars + # export IMAGE_VERSION=$(cat ../version.txt) + # export IMAGE_VERSION_FULL=v$IMAGE_VERSION + # echo $IMAGE_VERSION + # echo $IMAGE_VERSION_FULL + # # Build our image, auth, and push + # docker build --tag ohif/app:$IMAGE_VERSION_FULL . + # echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin + # docker push ohif/app:$IMAGE_VERSION_FULL fi workflows: diff --git a/package.json b/package.json index c283cec5b..350c7d488 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "cli": "node ./platform/cli/src/index.js", "build:ui:deploy-preview": "lerna run build:ui:deploy-preview --stream", "build:demo": "lerna run build:viewer:demo --stream", - "build:package-all": "lerna run build:package --stream", + "build:package-all": "lerna run build:package --parallel --stream", "dev": "lerna run dev:viewer --stream", "dev:project": ".scripts/dev.sh", "dev:orthanc": "lerna run dev:orthanc --stream",