Skip to content
This repository has been archived by the owner on May 16, 2024. It is now read-only.

Commit

Permalink
chore(release): v5.2.16
Browse files Browse the repository at this point in the history
  • Loading branch information
nellyk authored Aug 27, 2020
2 parents 42f6133 + 3aa6d54 commit 30212ac
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 17 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/docker_development_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_production_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/integrations_test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: One App Integration Tests
on:
on:
push:
branches:
- master
Expand All @@ -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


6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.

<a name="5.2.16"></a>
## [5.2.16](https://github.com/americanexpress/one-app/compare/v5.2.15...v5.2.16) (2020-08-18)


<a name="5.2.15"></a>
## [5.2.15](https://github.com/americanexpress/one-app/compare/v5.2.14...v5.2.15) (2020-08-18)

Expand Down
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -39,6 +40,7 @@ EXPOSE 3002
EXPOSE 3005
WORKDIR /opt/one-app
RUN chown node:node /opt/one-app
USER $user
CMD ["node", "lib/server"]
COPY --from=builder --chown=node:node /opt/one-app/development ./

Expand All @@ -51,5 +53,6 @@ ENV NODE_ENV=production
EXPOSE 3000
EXPOSE 3005
WORKDIR /opt/one-app
USER $user
CMD ["node", "lib/server"]
COPY --from=builder --chown=node:node /opt/one-app/production ./
2 changes: 1 addition & 1 deletion one-app-statics/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down

0 comments on commit 30212ac

Please sign in to comment.