From 12cde636c40fcb82f06dae080774d48b8c5efb58 Mon Sep 17 00:00:00 2001 From: James Zetlen Date: Wed, 6 May 2020 09:51:27 -0500 Subject: [PATCH 1/6] fix(install): Use npm-is to require Yarn before install. Fixes PWA-505. --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 968476bc6e..176271c6e6 100755 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "danger": "danger-ci", "lint": "eslint '@(packages|scripts)/**/{*.js,package.json}' --ignore-pattern node_modules --ignore-pattern storybook-dist", "postbuild": "rimraf \"./packages/*/dist/{,**/}__*__\"", + "preinstall": "npx npm-is yarn", "prepare": "node scripts/monorepo-introduction.js", "prettier": "prettier --loglevel warn --write '@(packages|scripts)/**/*.@(css|graphql|js)' '*.js'", "prettier:check": "prettier --list-different '@(packages|scripts)/**/*.@(css|graphql|js)' '*.js'", From d52224292fe7db6ce2c1b91661820d68fe456d74 Mon Sep 17 00:00:00 2001 From: Dev Patil Date: Wed, 6 May 2020 15:46:27 -0500 Subject: [PATCH 2/6] Handle CI build failure --- prod.dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/prod.dockerfile b/prod.dockerfile index 98f47af343..e30c9c376e 100644 --- a/prod.dockerfile +++ b/prod.dockerfile @@ -23,6 +23,9 @@ COPY packages/venia-concept/package.json ./packages/venia-concept/package.json COPY package.json yarn.lock babel.config.js magento-compatibility.js ./ COPY scripts/monorepo-introduction.js ./scripts/monorepo-introduction.js +# To handle "could not get uid/gid" +RUN npm config set unsafe-perm true + # install dependencies with yarn RUN yarn install --frozen-lockfile From 31247bac64897cbc7026fa4c9501fc8533112546 Mon Sep 17 00:00:00 2001 From: James Zetlen Date: Thu, 7 May 2020 10:36:48 -0500 Subject: [PATCH 3/6] fix: do not check in CI --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 176271c6e6..1d23986f0b 100755 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "danger": "danger-ci", "lint": "eslint '@(packages|scripts)/**/{*.js,package.json}' --ignore-pattern node_modules --ignore-pattern storybook-dist", "postbuild": "rimraf \"./packages/*/dist/{,**/}__*__\"", - "preinstall": "npx npm-is yarn", + "preinstall": "node -e 'process.env.CI||process.exit(1)' || npx npm-is npm", "prepare": "node scripts/monorepo-introduction.js", "prettier": "prettier --loglevel warn --write '@(packages|scripts)/**/*.@(css|graphql|js)' '*.js'", "prettier:check": "prettier --list-different '@(packages|scripts)/**/*.@(css|graphql|js)' '*.js'", From d0801cb5978e550fd1a683723c13b96cd2cb9a6a Mon Sep 17 00:00:00 2001 From: Dev Patil Date: Thu, 7 May 2020 11:56:55 -0500 Subject: [PATCH 4/6] Revert docker commit and update typo --- package.json | 2 +- prod.dockerfile | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 1d23986f0b..84b8ae2bfb 100755 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "danger": "danger-ci", "lint": "eslint '@(packages|scripts)/**/{*.js,package.json}' --ignore-pattern node_modules --ignore-pattern storybook-dist", "postbuild": "rimraf \"./packages/*/dist/{,**/}__*__\"", - "preinstall": "node -e 'process.env.CI||process.exit(1)' || npx npm-is npm", + "preinstall": "node -e 'process.env.CI||process.exit(1)' || npx npm-is yarn", "prepare": "node scripts/monorepo-introduction.js", "prettier": "prettier --loglevel warn --write '@(packages|scripts)/**/*.@(css|graphql|js)' '*.js'", "prettier:check": "prettier --list-different '@(packages|scripts)/**/*.@(css|graphql|js)' '*.js'", diff --git a/prod.dockerfile b/prod.dockerfile index e30c9c376e..98f47af343 100644 --- a/prod.dockerfile +++ b/prod.dockerfile @@ -23,9 +23,6 @@ COPY packages/venia-concept/package.json ./packages/venia-concept/package.json COPY package.json yarn.lock babel.config.js magento-compatibility.js ./ COPY scripts/monorepo-introduction.js ./scripts/monorepo-introduction.js -# To handle "could not get uid/gid" -RUN npm config set unsafe-perm true - # install dependencies with yarn RUN yarn install --frozen-lockfile From 9e5339b1f3bb091fbb63b2dcf8c8511081de4cfc Mon Sep 17 00:00:00 2001 From: Dev Patil Date: Thu, 7 May 2020 12:19:41 -0500 Subject: [PATCH 5/6] Handle docker uid/gid switch issue --- prod.dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/prod.dockerfile b/prod.dockerfile index 98f47af343..e30c9c376e 100644 --- a/prod.dockerfile +++ b/prod.dockerfile @@ -23,6 +23,9 @@ COPY packages/venia-concept/package.json ./packages/venia-concept/package.json COPY package.json yarn.lock babel.config.js magento-compatibility.js ./ COPY scripts/monorepo-introduction.js ./scripts/monorepo-introduction.js +# To handle "could not get uid/gid" +RUN npm config set unsafe-perm true + # install dependencies with yarn RUN yarn install --frozen-lockfile From 76906749095714fc36674b7d4cd59c95cd6fdf76 Mon Sep 17 00:00:00 2001 From: Dev Patil Date: Thu, 7 May 2020 12:48:50 -0500 Subject: [PATCH 6/6] set CI env variable in dockerfile --- dev.dockerfile | 3 +++ prod.dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dev.dockerfile b/dev.dockerfile index 6bf4d8a58f..a1432d857e 100644 --- a/dev.dockerfile +++ b/dev.dockerfile @@ -13,6 +13,9 @@ RUN apk --no-cache --virtual add \ g++ \ yarn +# set env variable for CI +ENV CI=true + # copy just the dependency files and configs needed for install COPY packages/create-pwa/package.json ./packages/create-pwa/package.json COPY packages/babel-preset-peregrine/package.json ./packages/babel-preset-peregrine/package.json diff --git a/prod.dockerfile b/prod.dockerfile index e30c9c376e..a3bd34df58 100644 --- a/prod.dockerfile +++ b/prod.dockerfile @@ -9,6 +9,9 @@ RUN apk --no-cache --virtual add \ g++ \ yarn +# set env variable for CI +ENV CI=true + # copy just the dependency files and configs needed for install COPY packages/create-pwa/package.json ./packages/create-pwa/package.json COPY packages/babel-preset-peregrine/package.json ./packages/babel-preset-peregrine/package.json @@ -23,9 +26,6 @@ COPY packages/venia-concept/package.json ./packages/venia-concept/package.json COPY package.json yarn.lock babel.config.js magento-compatibility.js ./ COPY scripts/monorepo-introduction.js ./scripts/monorepo-introduction.js -# To handle "could not get uid/gid" -RUN npm config set unsafe-perm true - # install dependencies with yarn RUN yarn install --frozen-lockfile