Skip to content

ansible: update Alpine containers #4142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
targos merged 1 commit into from
Sep 7, 2025
Merged

ansible: update Alpine containers #4142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 0 additions & 63 deletions ansible/roles/docker/templates/alpine315.Dockerfile.j2
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions ansible/roles/docker/templates/alpine318.Dockerfile.j2
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion ansible/roles/docker/templates/alpine321.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ RUN apk add --no-cache --virtual .build-deps \
shadow \
binutils-gold \
curl \
clang19 \
g++ \
gcc \
gnupg \
Expand All @@ -32,7 +33,7 @@ RUN apk add --no-cache --virtual .build-deps \
ccache \
openjdk21 \
git \
procps \
procps-ng \
Comment on lines -35 to +36
Copy link
Member Author

@targos targos Sep 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to https://pkgs.alpinelinux.org/packages?name=procps*&branch=v3.21&repo=&arch=x86_64&origin=&flagged=&maintainer=, procps doesn't exist anymore.

openssh-client-default \
py3-pip \
bash \
Expand Down
5 changes: 3 additions & 2 deletions .../docker/templates/alpine319.Dockerfile.j2 → .../docker/templates/alpine322.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:3.21

ENV LC_ALL C
ENV USER {{ server_user }}
Expand All @@ -21,6 +21,7 @@ RUN apk add --no-cache --virtual .build-deps \
shadow \
binutils-gold \
curl \
clang19 \
g++ \
gcc \
gnupg \
Expand All @@ -32,7 +33,7 @@ RUN apk add --no-cache --virtual .build-deps \
ccache \
openjdk21 \
git \
procps \
procps-ng \
openssh-client-default \
py3-pip \
bash \
Expand Down
7 changes: 7 additions & 0 deletions jenkins/scripts/select-compiler.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ if [ "$NODEJS_MAJOR_VERSION" -ge "25" ]; then
echo "Compiler set to Clang" `${CXX} -dumpversion`
return
;;
*alpine*)
echo "Using Clang for Node.js $NODEJS_MAJOR_VERSION"
export CC="ccache clang"
export CXX="ccache clang++"
echo "Compiler set to Clang" `${CXX} -dumpversion`
return
;;
esac
fi

Expand Down