Skip to content

Commit 94afa85

Browse files
committed
Merge branch 'dr_test_alipine_24' into dr_test_take3
* dr_test_alipine_24: Updating workflow Testing dockerfile node24
2 parents 8791c5c + 33b4dec commit 94afa85

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99

1010
strategy:
1111
matrix:
12-
node-version: [16.x]
12+
node-version: [24.x]
1313

1414
steps:
1515
- name: Checkout Repository
@@ -26,7 +26,7 @@ jobs:
2626

2727
strategy:
2828
matrix:
29-
node-version: [16.x]
29+
node-version: [24.x]
3030

3131
steps:
3232
- name: Checkout Repository
@@ -43,7 +43,7 @@ jobs:
4343

4444
strategy:
4545
matrix:
46-
node-version: [16.x]
46+
node-version: [24.x]
4747

4848
steps:
4949
- name: Checkout Repository

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99

1010
strategy:
1111
matrix:
12-
node-version: [16.x]
12+
node-version: [24.x]
1313

1414
steps:
1515
- name: Checkout Repository
@@ -26,7 +26,7 @@ jobs:
2626

2727
strategy:
2828
matrix:
29-
node-version: [16.x]
29+
node-version: [24.x]
3030

3131
steps:
3232
- name: Checkout Repository

docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
FROM node:16.14.2-alpine3.15
1+
FROM node:24-alpine3.22
22

33
LABEL \
44
mitre.name=cveawg \
55
mitre.project=cveawg
66

7+
ENV PIP_BREAK_SYSTEM_PACKAGES=1
78
# Run an optional pre-flight script for host-dependent reqs such as CA certs
89
# Use --build-arg:
910
# docker compose --build-arg CVE_PREFLIGHT="wget -q -O - --no-check-certificate http://pki.local/install_certs.sh | sh"
@@ -12,8 +13,7 @@ RUN sh -c "${CVE_PREFLIGHT:-exit 0}"
1213

1314
# Install python/pip (required for argon2 build from source)
1415
ENV PYTHONUNBUFFERED=1
15-
RUN apk add --update --no-cache python3
16-
RUN python3 -m ensurepip
16+
RUN apk add --update --no-cache python3 py3-pip
1717
RUN pip3 install --no-cache --upgrade pip setuptools
1818

1919
# Install build essentials (also required for argon2)

docker/Dockerfile.dev

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
FROM node:16.14.2-alpine3.15
1+
FROM node:24-alpine3.22
22
# do not copy files we mount in compose
33
# our local and production docker files could co-exist using "targets" in
44
# the `FROM` statements
55

6+
ENV PIP_BREAK_SYSTEM_PACKAGES=1
67
LABEL \
78
mitre.name=cveawg \
89
mitre.project=cveawg
@@ -15,8 +16,7 @@ RUN sh -c "${CVE_PREFLIGHT:-exit 0}"
1516

1617
# Install python/pip (required for argon2 build from source)
1718
ENV PYTHONUNBUFFERED=1
18-
RUN apk add --update --no-cache python3
19-
RUN python3 -m ensurepip
19+
RUN apk add --update --no-cache python3 py3-pip
2020
RUN pip3 install --no-cache --upgrade pip setuptools
2121

2222
# Install build essentials (also required for argon2)

0 commit comments

Comments
 (0)