Skip to content

Commit 6f6361e

Browse files
committed
ansible: update Alpine containers
- Add Clang 19 - Add latest Alpine 3.22 - Remove old configs that were deleted from Jenkins Refs: #4091 Closes: #4141
1 parent 3cc5057 commit 6f6361e

File tree

5 files changed

+12
-129
lines changed

5 files changed

+12
-129
lines changed

ansible/roles/docker/templates/alpine315.Dockerfile.j2

Lines changed: 0 additions & 63 deletions
This file was deleted.

ansible/roles/docker/templates/alpine318.Dockerfile.j2

Lines changed: 0 additions & 63 deletions
This file was deleted.

ansible/roles/docker/templates/alpine321.Dockerfile.j2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ RUN apk add --no-cache --virtual .build-deps \
2121
shadow \
2222
binutils-gold \
2323
curl \
24+
clang19 \
2425
g++ \
2526
gcc \
2627
gnupg \
@@ -32,7 +33,7 @@ RUN apk add --no-cache --virtual .build-deps \
3233
ccache \
3334
openjdk21 \
3435
git \
35-
procps \
36+
procps-ng \
3637
openssh-client-default \
3738
py3-pip \
3839
bash \

ansible/roles/docker/templates/alpine319.Dockerfile.j2 renamed to ansible/roles/docker/templates/alpine322.Dockerfile.j2

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.19
1+
FROM alpine:3.21
22

33
ENV LC_ALL C
44
ENV USER {{ server_user }}
@@ -21,6 +21,7 @@ RUN apk add --no-cache --virtual .build-deps \
2121
shadow \
2222
binutils-gold \
2323
curl \
24+
clang19 \
2425
g++ \
2526
gcc \
2627
gnupg \
@@ -32,7 +33,7 @@ RUN apk add --no-cache --virtual .build-deps \
3233
ccache \
3334
openjdk21 \
3435
git \
35-
procps \
36+
procps-ng \
3637
openssh-client-default \
3738
py3-pip \
3839
bash \

jenkins/scripts/select-compiler.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@ if [ "$NODEJS_MAJOR_VERSION" -ge "25" ]; then
5757
echo "Compiler set to Clang" `${CXX} -dumpversion`
5858
return
5959
;;
60+
*alpine*)
61+
echo "Using Clang for Node.js $NODEJS_MAJOR_VERSION"
62+
export CC="ccache clang"
63+
export CXX="ccache clang++"
64+
echo "Compiler set to Clang" `${CXX} -dumpversion`
65+
return
66+
;;
6067
esac
6168
fi
6269

0 commit comments

Comments
 (0)