From 36a268f92e19e44ed715e940c7dca4f62ee4554e Mon Sep 17 00:00:00 2001 From: OneAmexBot Date: Tue, 4 Aug 2020 14:27:18 +0000 Subject: [PATCH 1/8] chore(release): 5.2.11 --- one-app-statics/package.json | 2 +- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/one-app-statics/package.json b/one-app-statics/package.json index d15cdc228..fe41517de 100644 --- a/one-app-statics/package.json +++ b/one-app-statics/package.json @@ -1,6 +1,6 @@ { "name": "one-app-statics-tests", - "version": "5.2.10", + "version": "5.2.11", "description": "One App Static Assets", "main": "index.js", "scripts": { diff --git a/package-lock.json b/package-lock.json index 649b50a0d..c6bf00266 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@americanexpress/one-app", - "version": "5.2.10", + "version": "5.2.11", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b9cebc3eb..66a5a09c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@americanexpress/one-app", - "version": "5.2.10", + "version": "5.2.11", "description": "One Amex SPA technology stack.", "main": "index.js", "engines": { From ea3ddeaf99ccda9a5685c500cacf1217b3c63fb4 Mon Sep 17 00:00:00 2001 From: OneAmexBot Date: Tue, 4 Aug 2020 14:27:19 +0000 Subject: [PATCH 2/8] docs(changelog): update --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d949b8044..ee3153e81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ --e -e -e -e -e -e -e -e -e -e -e -e -e # Changelog +-e -e -e -e -e -e -e -e -e -e -e -e -e -e # Changelog All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [5.2.11](https://github.com/americanexpress/one-app/compare/v5.2.10...v5.2.11) (2020-08-04) + + ## [5.2.10](https://github.com/americanexpress/one-app/compare/v5.2.8...v5.2.10) (2020-07-24) From dfc8c8723397cedd368d50b66b9c548c017f68c6 Mon Sep 17 00:00:00 2001 From: OneAmexBot Date: Tue, 18 Aug 2020 13:50:21 +0000 Subject: [PATCH 3/8] chore(release): 5.2.16 --- one-app-statics/package.json | 2 +- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/one-app-statics/package.json b/one-app-statics/package.json index 13d0ff94a..174d4e625 100644 --- a/one-app-statics/package.json +++ b/one-app-statics/package.json @@ -1,6 +1,6 @@ { "name": "one-app-statics-tests", - "version": "5.2.15", + "version": "5.2.16", "description": "One App Static Assets", "main": "index.js", "scripts": { diff --git a/package-lock.json b/package-lock.json index 205a2e0b7..788467c73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@americanexpress/one-app", - "version": "5.2.15", + "version": "5.2.16", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 103c7e75e..9926919ce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@americanexpress/one-app", - "version": "5.2.15", + "version": "5.2.16", "description": "One Amex SPA technology stack.", "main": "index.js", "engines": { From b6220be6184cae9b7e6ddcc657a2914cb7f25a2d Mon Sep 17 00:00:00 2001 From: OneAmexBot Date: Tue, 18 Aug 2020 13:50:21 +0000 Subject: [PATCH 4/8] docs(changelog): update --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b11f83f92..2e88617ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ --e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e # Changelog +-e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e # Changelog All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [5.2.16](https://github.com/americanexpress/one-app/compare/v5.2.15...v5.2.16) (2020-08-18) + + ## [5.2.15](https://github.com/americanexpress/one-app/compare/v5.2.14...v5.2.15) (2020-08-18) From ef0c784a64700284bbce035cf01527c031cf56fb Mon Sep 17 00:00:00 2001 From: Nelly Kiboi Date: Mon, 24 Aug 2020 16:01:49 +0100 Subject: [PATCH 5/8] chore(release): docker file --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index ab1d551a1..ccc92c9aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,6 +39,7 @@ EXPOSE 3002 EXPOSE 3005 WORKDIR /opt/one-app RUN chown node:node /opt/one-app +USER node CMD ["node", "lib/server"] COPY --from=builder --chown=node:node /opt/one-app/development ./ @@ -51,5 +52,6 @@ ENV NODE_ENV=production EXPOSE 3000 EXPOSE 3005 WORKDIR /opt/one-app +USER node CMD ["node", "lib/server"] COPY --from=builder --chown=node:node /opt/one-app/production ./ From ebbb114481004ace1e5163ffde156a51764116af Mon Sep 17 00:00:00 2001 From: Nelly Kiboi Date: Thu, 27 Aug 2020 16:48:44 +0100 Subject: [PATCH 6/8] chore(release): actions --- prod-sample/docker-compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/prod-sample/docker-compose.yml b/prod-sample/docker-compose.yml index a654f0637..b66a136fd 100644 --- a/prod-sample/docker-compose.yml +++ b/prod-sample/docker-compose.yml @@ -12,6 +12,7 @@ services: - no_proxy # tags the built image as: image: one-app:at-test + user: node expose: - "8443" volumes: @@ -38,6 +39,7 @@ services: - no_proxy ports: - "8000:80" + user: node networks: one-app-at-test-network: aliases: @@ -51,6 +53,7 @@ services: - no_proxy ports: - "8001:80" + user: node entrypoint: - "npm" - "start" @@ -67,6 +70,7 @@ services: - http_proxy - https_proxy - no_proxy + user: node ports: - "8002:80" entrypoint: @@ -80,6 +84,7 @@ services: - extra-slow.api.frank nginx: image: nginx:1.17.5-alpine + user: node volumes: - ./nginx/default.conf:/etc/nginx/conf.d/default.conf - ./nginx/nginx-cert.pem:/etc/ssl/nginx-cert.pem @@ -93,6 +98,7 @@ services: # specify docker image sha to ensure consistency image: selenium/standalone-chrome-debug@sha256:e8bf805eca673e6788fb50249b105be860d991ee0fa3696422b4cb92acb5c07a # https://github.com/SeleniumHQ/docker-selenium#running-the-images + user: node volumes: - /dev/shm:/dev/shm ports: From d9dfefa9c78e74162960adce55971fc8a26f9883 Mon Sep 17 00:00:00 2001 From: Nelly Kiboi Date: Thu, 27 Aug 2020 21:46:55 +0100 Subject: [PATCH 7/8] chore(release): user --- prod-sample/docker-compose.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/prod-sample/docker-compose.yml b/prod-sample/docker-compose.yml index b66a136fd..a654f0637 100644 --- a/prod-sample/docker-compose.yml +++ b/prod-sample/docker-compose.yml @@ -12,7 +12,6 @@ services: - no_proxy # tags the built image as: image: one-app:at-test - user: node expose: - "8443" volumes: @@ -39,7 +38,6 @@ services: - no_proxy ports: - "8000:80" - user: node networks: one-app-at-test-network: aliases: @@ -53,7 +51,6 @@ services: - no_proxy ports: - "8001:80" - user: node entrypoint: - "npm" - "start" @@ -70,7 +67,6 @@ services: - http_proxy - https_proxy - no_proxy - user: node ports: - "8002:80" entrypoint: @@ -84,7 +80,6 @@ services: - extra-slow.api.frank nginx: image: nginx:1.17.5-alpine - user: node volumes: - ./nginx/default.conf:/etc/nginx/conf.d/default.conf - ./nginx/nginx-cert.pem:/etc/ssl/nginx-cert.pem @@ -98,7 +93,6 @@ services: # specify docker image sha to ensure consistency image: selenium/standalone-chrome-debug@sha256:e8bf805eca673e6788fb50249b105be860d991ee0fa3696422b4cb92acb5c07a # https://github.com/SeleniumHQ/docker-selenium#running-the-images - user: node volumes: - /dev/shm:/dev/shm ports: From 3aa6d5409dd48e787bc548d968315784d88866f1 Mon Sep 17 00:00:00 2001 From: nkiboi Date: Thu, 27 Aug 2020 22:06:55 +0100 Subject: [PATCH 8/8] feat(release): merge --- .github/workflows/docker_development_image.yml | 10 +++++----- .github/workflows/docker_production_image.yml | 2 +- .github/workflows/integrations_test.yml | 14 +++++++------- Dockerfile | 5 +++-- one-app-statics/package.json | 4 ---- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.github/workflows/docker_development_image.yml b/.github/workflows/docker_development_image.yml index 7fda7cd2b..7d5f798f6 100644 --- a/.github/workflows/docker_development_image.yml +++ b/.github/workflows/docker_development_image.yml @@ -3,8 +3,8 @@ on: workflow_dispatch: inputs: docker_tag_version: - description: 'Sementic Version' - required: true + description: 'Sementic Version' + required: true repository_dispatch: types: [one-app-docker-dev-build] jobs: @@ -31,14 +31,14 @@ jobs: fi - name: Build development docker image run: | - echo "Tags: ${{ github.event.inputs.tags }}" - echo "tag: ${{ github.event.inputs.docker_tag_version }}" + echo "Tags: ${{ github.event.inputs.tags }}" + echo "tag: ${{ github.event.inputs.docker_tag_version }}" echo "major-version: ${{ github.event.inputs.major_version }}" echo "minor-version: ${{ github.event.inputs.minor_version }}" - name: Docker login run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login --username ${{ secrets.DOCKER_USER }} --password-stdin - name: Build development docker image - run: docker build -t dev . --target=development + run: docker build -t dev . --target=development --build-arg user=node - name: Tag Docker Images run: | docker tag dev ${{ secrets.DOCKER_USER }}/one-app-dev:${{ steps.set_docker_version.outputs.major_version }} diff --git a/.github/workflows/docker_production_image.yml b/.github/workflows/docker_production_image.yml index f0825382b..69a2032b0 100644 --- a/.github/workflows/docker_production_image.yml +++ b/.github/workflows/docker_production_image.yml @@ -16,7 +16,7 @@ jobs: - name: Docker login run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login --username ${{ secrets.DOCKER_USER }} --password-stdin - name: Build production docker image - run: docker build -t prod . + run: docker build -t prod . --build-arg user=node - name: Extract sem versions id: get_sem_version run: | diff --git a/.github/workflows/integrations_test.yml b/.github/workflows/integrations_test.yml index fdfd02ae1..771574c20 100644 --- a/.github/workflows/integrations_test.yml +++ b/.github/workflows/integrations_test.yml @@ -1,5 +1,5 @@ name: One App Integration Tests -on: +on: push: branches: - master @@ -22,24 +22,24 @@ jobs: - name: npm install run: NODE_ENV=development npm ci - name: Build docker image - run: docker build -t one-app:at-test . + run: docker build -t one-app:at-test . --build-arg user=root - name: Build Sample Modules run: | - npm run build:sample-modules -- --archive-built-artifacts --bundle-statics-origin=https://one-app-statics.surge.sh + npm run build:sample-modules -- --archive-built-artifacts --bundle-statics-origin=https://one-app-statics.surge.sh echo 'https://one-app-sample.herokuapp.com' >> sample-module-bundles/CORS - name: Teardown Surge run: npx surge teardown one-app-statics.surge.sh - name: Move sample modules to Surge - run: npx surge sample-module-bundles one-app-statics.surge.sh + run: npx surge sample-module-bundles one-app-statics.surge.sh - name: Login to Heroku run: docker login -u="$HEROKU_DOCKER_USERNAME" -p="$HEROKU_API_KEY" registry.heroku.com - name: Docker Tag run: docker tag one-app:at-test registry.heroku.com/$HEROKU_APP_ID/web - - name: Docker Push - run: docker push registry.heroku.com/$HEROKU_APP_ID/web + - name: Docker Push + run: docker push registry.heroku.com/$HEROKU_APP_ID/web - name: Heroku Release Images run: npx heroku container:release web -a $HEROKU_APP_ID - name: Run Integration Tests on Heroku run: ONE_DANGEROUSLY_SKIP_ONE_APP_IMAGE_BUILD=true npm run test:integration -- --remote-one-app-environment=$HEROKU_APP_URL - + diff --git a/Dockerfile b/Dockerfile index ccc92c9aa..d57632c49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,7 @@ # builds as we do not have to run apk installs for alpine. FROM node:12 as builder WORKDIR /opt/build +ARG user RUN npm install -g npm@6.12.1 --registry=https://registry.npmjs.org COPY --chown=node:node ./ /opt/build # npm ci does not run postinstall with root account @@ -39,7 +40,7 @@ EXPOSE 3002 EXPOSE 3005 WORKDIR /opt/one-app RUN chown node:node /opt/one-app -USER node +USER $user CMD ["node", "lib/server"] COPY --from=builder --chown=node:node /opt/one-app/development ./ @@ -52,6 +53,6 @@ ENV NODE_ENV=production EXPOSE 3000 EXPOSE 3005 WORKDIR /opt/one-app -USER node +USER $user CMD ["node", "lib/server"] COPY --from=builder --chown=node:node /opt/one-app/production ./ diff --git a/one-app-statics/package.json b/one-app-statics/package.json index 23d8a4f9c..174d4e625 100644 --- a/one-app-statics/package.json +++ b/one-app-statics/package.json @@ -1,10 +1,6 @@ { "name": "one-app-statics-tests", -<<<<<<< HEAD - "version": "5.2.11", -======= "version": "5.2.16", ->>>>>>> d9dfefa9c78e74162960adce55971fc8a26f9883 "description": "One App Static Assets", "main": "index.js", "scripts": {