Skip to content

Commit cd3d1b5

Browse files
mtrezzamtrezza
authored
Merge branch 'alpha' into snyk-fix-26e1c84e105ba1c3f9ca4ee3fe13e03e
Signed-off-by: Manuel <5673677+mtrezza@users.noreply.github.com>
2 parents 29c582c + 6c4d392 commit cd3d1b5

27 files changed

+2210
-629
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,27 +76,34 @@ jobs:
7676
include:
7777
- name: Docker linux/amd64
7878
DOCKER_PLATFORM: linux/amd64
79-
# Building currently fails for the platforms below
80-
# - name: Docker linux/arm/v6
81-
# DOCKER_PLATFORM: linux/arm/v6
82-
# - name: Docker linux/arm/v7
83-
# DOCKER_PLATFORM: linux/arm/v7
79+
RUNNER_TYPE: ubuntu-latest
8480
# - name: Docker linux/arm64/v8
8581
# DOCKER_PLATFORM: linux/arm64/v8
82+
# # Replace this with a native arm linux runner when available, presumably by EOY 2024, see:
83+
# # https://github.com/orgs/community/discussions/19197#discussioncomment-10550689
84+
# # The conditional setup of QEMU may need to be adapted to not run on native arm,
85+
# # which will speed up the build process for arm64/v8 since no emulation will be needed.
86+
# RUNNER_TYPE: ubuntu-latest
8687
fail-fast: false
8788
name: ${{ matrix.name }}
88-
timeout-minutes: 15
89-
runs-on: ubuntu-latest
89+
timeout-minutes: 45
90+
runs-on: ${{ matrix.RUNNER_TYPE }}
9091
steps:
9192
- uses: actions/checkout@v4
9293
- name: Set up QEMU
93-
uses: docker/setup-qemu-action@v1
94+
uses: docker/setup-qemu-action@v2
95+
# Only set up QEMU if not running on native arm
96+
if: ${{ matrix.DOCKER_PLATFORM != 'linux/amd64' && matrix.RUNNER_TYPE == 'ubuntu-latest' }}
9497
- name: Set up Docker Buildx
95-
uses: docker/setup-buildx-action@v1
98+
uses: docker/setup-buildx-action@v2
99+
with:
100+
install: true
96101
- name: Build docker image
97-
uses: docker/build-push-action@v2
102+
uses: docker/build-push-action@v3
98103
with:
99104
platforms: ${{ matrix.DOCKER_PLATFORM }}
105+
cache-from: type=gha
106+
cache-to: type=gha,mode=max
100107
check-lock-file-version:
101108
name: NPM Lock File Version
102109
timeout-minutes: 5
@@ -112,9 +119,11 @@ jobs:
112119
matrix:
113120
include:
114121
- name: Node 18
115-
NODE_VERSION: 18.19.1
122+
NODE_VERSION: 18.20.4
116123
- name: Node 20
117-
NODE_VERSION: 20.11.1
124+
NODE_VERSION: 20.18.0
125+
- name: Node 22
126+
NODE_VERSION: 22.9.0
118127
fail-fast: false
119128
name: ${{ matrix.name }}
120129
timeout-minutes: 15

‎.github/workflows/release-automated.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
REGISTRY: docker.io
4040
IMAGE_NAME: parseplatform/parse-dashboard
4141
runs-on: ubuntu-latest
42+
timeout-minutes: 60
4243
permissions:
4344
contents: read
4445
packages: write
@@ -52,29 +53,33 @@ jobs:
5253
ref: ${{ needs.release.outputs.current_tag }}
5354
- name: Set up QEMU
5455
id: qemu
55-
uses: docker/setup-qemu-action@v1
56+
uses: docker/setup-qemu-action@v2
5657
- name: Set up Docker Buildx
57-
uses: docker/setup-buildx-action@v1
58+
uses: docker/setup-buildx-action@v2
59+
with:
60+
install: true
5861
- name: Log into Docker Hub
5962
if: github.event_name != 'pull_request'
60-
uses: docker/login-action@v1
63+
uses: docker/login-action@v2
6164
with:
6265
username: ${{ secrets.DOCKERHUB_USERNAME }}
6366
password: ${{ secrets.DOCKERHUB_TOKEN }}
6467
- name: Extract Docker metadata
6568
id: meta
66-
uses: docker/metadata-action@v3
69+
uses: docker/metadata-action@v4
6770
with:
6871
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
6972
flavor: |
7073
latest=${{ steps.branch.outputs.branch_name == 'release' }}
7174
tags: |
7275
type=semver,pattern={{version}},value=${{ needs.release.outputs.current_tag }}
7376
- name: Build and push Docker image
74-
uses: docker/build-push-action@v2
77+
uses: docker/build-push-action@v3
7578
with:
7679
context: .
77-
platforms: linux/amd64
80+
platforms: linux/amd64, linux/arm64/v8
81+
cache-from: type=gha
82+
cache-to: type=gha,mode=max
7883
push: ${{ github.event_name != 'pull_request' }}
7984
tags: ${{ steps.meta.outputs.tags }}
8085
labels: ${{ steps.meta.outputs.labels }}

‎.github/workflows/release-manual-docker.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ env:
1515
jobs:
1616
build:
1717
runs-on: ubuntu-latest
18+
timeout-minutes: 60
1819
permissions:
1920
contents: read
2021
packages: write
@@ -28,18 +29,20 @@ jobs:
2829
ref: ${{ github.event.inputs.ref }}
2930
- name: Set up QEMU
3031
id: qemu
31-
uses: docker/setup-qemu-action@v1
32+
uses: docker/setup-qemu-action@v2
3233
- name: Set up Docker Buildx
33-
uses: docker/setup-buildx-action@v1
34+
uses: docker/setup-buildx-action@v2
35+
with:
36+
install: true
3437
- name: Log into Docker Hub
3538
if: github.event_name != 'pull_request'
36-
uses: docker/login-action@v1
39+
uses: docker/login-action@v2
3740
with:
3841
username: ${{ secrets.DOCKERHUB_USERNAME }}
3942
password: ${{ secrets.DOCKERHUB_TOKEN }}
4043
- name: Extract Docker metadata
4144
id: meta
42-
uses: docker/metadata-action@v3
45+
uses: docker/metadata-action@v4
4346
with:
4447
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
4548
flavor: |
@@ -48,10 +51,12 @@ jobs:
4851
type=semver,enable=true,pattern={{version}},value=${{ github.event.inputs.ref }}
4952
type=raw,enable=${{ github.event.inputs.ref == '' }},value=latest
5053
- name: Build and push Docker image
51-
uses: docker/build-push-action@v2
54+
uses: docker/build-push-action@v3
5255
with:
5356
context: .
54-
platforms: linux/amd64
57+
platforms: linux/amd64, linux/arm64/v8
58+
cache-from: type=gha
59+
cache-to: type=gha,mode=max
5560
push: ${{ github.event_name != 'pull_request' }}
5661
tags: ${{ steps.meta.outputs.tags }}
5762
labels: ${{ steps.meta.outputs.labels }}

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
############################################################
22
# Build stage
33
############################################################
4-
FROM node:20.14.0-alpine3.20 AS build
4+
FROM node:20.17.0-alpine3.20 AS build
55

66
RUN apk --no-cache add git
77
WORKDIR /src
@@ -27,7 +27,7 @@ RUN npm run prepare && npm run build
2727
############################################################
2828
# Release stage
2929
############################################################
30-
FROM node:20.14.0-alpine3.20 AS release
30+
FROM node:20.17.0-alpine3.20 AS release
3131
WORKDIR /src
3232

3333
# Copy production node_modules

0 commit comments

Comments
 (0)