Skip to content

Commit

Permalink
Merge pull request #121 from timoa/develop
Browse files Browse the repository at this point in the history
Release fix for Google Play + update dependencies
  • Loading branch information
timoa authored Sep 8, 2022
2 parents 3d6b26a + 7678a04 commit 1315077
Show file tree
Hide file tree
Showing 7 changed files with 1,482 additions and 3,033 deletions.
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"platformAutomerge": true,
"branchPrefix": "fix/deps/",
"addLabels": [
"deps",
"dependencies",
"security"
],
"assignees": [
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/code-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Harden the GitHub Actions Runner
uses: step-security/harden-runner@dd5681a7d0c66fb362664d618ef4a90d656f6516
uses: step-security/harden-runner@0b61316f5a3fc8b7b29daa3d9b4a37cd052d11ed
with:
egress-policy: block
allowed-endpoints: >
Expand All @@ -37,7 +37,7 @@ jobs:

steps:
- name: Harden the GitHub Actions Runner
uses: step-security/harden-runner@dd5681a7d0c66fb362664d618ef4a90d656f6516
uses: step-security/harden-runner@0b61316f5a3fc8b7b29daa3d9b4a37cd052d11ed
with:
egress-policy: block
allowed-endpoints: >
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: Harden the GitHub Actions Runner
uses: step-security/harden-runner@dd5681a7d0c66fb362664d618ef4a90d656f6516
uses: step-security/harden-runner@0b61316f5a3fc8b7b29daa3d9b4a37cd052d11ed
with:
egress-policy: block
allowed-endpoints: >
Expand All @@ -44,15 +44,15 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@27ea8f8fe5977c00f5b37e076ab846c5bd783b96 # tag=v2.1.12
uses: github/codeql-action/init@7fee4ca032ac341c12486c4c06822c5221c76533 # tag=v2.1.20
# Override language selection by uncommenting this and choosing your languages
# with:
# languages: go, javascript, csharp, python, cpp, java

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below).
- name: Autobuild
uses: github/codeql-action/autobuild@27ea8f8fe5977c00f5b37e076ab846c5bd783b96 # tag=v2.1.12
uses: github/codeql-action/autobuild@7fee4ca032ac341c12486c4c06822c5221c76533 # tag=v2.1.20

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -66,4 +66,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@27ea8f8fe5977c00f5b37e076ab846c5bd783b96 # tag=v2.1.12
uses: github/codeql-action/analyze@7fee4ca032ac341c12486c4c06822c5221c76533 # tag=v2.1.20
17 changes: 9 additions & 8 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: Harden GitHub Actions Runner
uses: step-security/harden-runner@dd5681a7d0c66fb362664d618ef4a90d656f6516
uses: step-security/harden-runner@0b61316f5a3fc8b7b29daa3d9b4a37cd052d11ed
with:
egress-policy: block
allowed-endpoints: >
Expand All @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2

- name: Setup Node.js ${{ matrix.node }}
uses: actions/setup-node@17f8bd926464a1afa4c6a11669539e9c1ba77048 # tag=v3.2.0
uses: actions/setup-node@2fddd8803e2f5c9604345a0b591c3020ee971a93 # tag=v3.4.1
with:
node-version: ${{ matrix.node }}
check-latest: true
Expand Down Expand Up @@ -63,14 +63,15 @@ jobs:

steps:
- name: Harden GitHub Actions Runner
uses: step-security/harden-runner@dd5681a7d0c66fb362664d618ef4a90d656f6516
uses: step-security/harden-runner@0b61316f5a3fc8b7b29daa3d9b4a37cd052d11ed
with:
egress-policy: block
allowed-endpoints: >
api.github.com:443
github.com:443
pipelines.actions.githubusercontent.com:443
sonarcloud.io:443
scanner.sonarcloud.io:443
- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2
Expand Down Expand Up @@ -100,7 +101,7 @@ jobs:

steps:
- name: Harden GitHub Actions Runner
uses: step-security/harden-runner@dd5681a7d0c66fb362664d618ef4a90d656f6516
uses: step-security/harden-runner@0b61316f5a3fc8b7b29daa3d9b4a37cd052d11ed
with:
egress-policy: block
allowed-endpoints: >
Expand Down Expand Up @@ -139,15 +140,15 @@ jobs:

steps:
- name: Harden GitHub Actions Runner
uses: step-security/harden-runner@dd5681a7d0c66fb362664d618ef4a90d656f6516
uses: step-security/harden-runner@0b61316f5a3fc8b7b29daa3d9b4a37cd052d11ed
with:
egress-policy: audit

- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2

- name: Semantic Release
uses: cycjimmy/semantic-release-action@v3
uses: cycjimmy/semantic-release-action@e1fe1fc00a3729593e87efb2f88475de76d64a24 # tag=v3.1.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -160,7 +161,7 @@ jobs:

steps:
- name: Harden GitHub Actions Runner
uses: step-security/harden-runner@dd5681a7d0c66fb362664d618ef4a90d656f6516
uses: step-security/harden-runner@0b61316f5a3fc8b7b29daa3d9b4a37cd052d11ed
with:
egress-policy: audit

Expand Down Expand Up @@ -194,7 +195,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@e551b19e49efd4e98792db7592c17c09b89db8d8 # tag=v3.0.0
uses: docker/build-push-action@c84f38281176d4c9cdb1626ffafcd6b3911b5d94 # tag=v3.1.1
with:
context: .
platforms: linux/amd64,linux/arm64
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16.15.1-alpine3.15@sha256:1fafca8cf41faf035192f5df1a5387656898bec6ac2f92f011d051ac2344f5c9
FROM node:16.17.0-alpine3.15@sha256:a60b681e1c28f60ea63f8394dea5384c69bdc464b9655e880f74aafaa5945665
ARG appPort=9514

LABEL maintainer="Damien Laureaux <d.laureaux@timoa.com>" \
Expand Down Expand Up @@ -27,7 +27,7 @@ HEALTHCHECK --interval=15s --timeout=5s --start-period=30s \
CMD npm run docker:status

RUN \
npm install --production --unsafe-perm && \
npm install --omit=dev --unsafe-perm && \
npm cache clean --force

RUN chown -R app-user /opt/app
Expand Down
Loading

0 comments on commit 1315077

Please sign in to comment.