Skip to content

fix(docker): fix docker base layering for llvm and mingw images #489

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
aminya merged 1 commit into from
Sep 9, 2026
Merged

fix(docker): fix docker base layering for llvm and mingw images #489

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
32 changes: 4 additions & 28 deletions dev/docker/ci/arch-llvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,8 @@
## base image
FROM archlinux:base AS setup-cpp-arch
FROM aminya/setup-cpp-arch:latest AS setup-cpp-arch-llvm

COPY "./dist/modern" "/usr/lib/setup-cpp/"

ENV NODE_OPTIONS="--enable-source-maps"

RUN chmod +x /usr/lib/setup-cpp/setup-cpp.mjs && \
ln -s /usr/lib/setup-cpp/setup-cpp.mjs /usr/local/bin/setup-cpp

RUN pacman -Syuu --noconfirm && \
pacman-db-upgrade && \
# install nodejs
pacman -S --noconfirm --needed nodejs npm && \
# install the compiler and tools
NODE_OPTIONS="--enable-source-maps" \
setup-cpp \
--autoreconf true \
--compiler llvm \
--cmake true \
--ninja true \
--task true \
--vcpkg true \
--python true \
--make true \
--cppcheck true \
--gcovr true \
--doxygen true \
--ccache true && \
# install llvm
RUN setup-cpp \
--compiler llvm && \
# arch cleanup
pacman -Scc --noconfirm && \
rm -rf /var/cache/pacman/pkg/* && \
Expand Down
33 changes: 5 additions & 28 deletions dev/docker/ci/arch-mingw.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,9 @@
## base image
FROM archlinux:base AS setup-cpp-arch-mingw
FROM aminya/setup-cpp-arch:latest AS setup-cpp-arch-mingw

COPY "./dist/modern" "/usr/lib/setup-cpp/"

ENV NODE_OPTIONS="--enable-source-maps"

RUN chmod +x /usr/lib/setup-cpp/setup-cpp.mjs && \
ln -s /usr/lib/setup-cpp/setup-cpp.mjs /usr/local/bin/setup-cpp

RUN pacman -Syuu --noconfirm && \
pacman-db-upgrade && \
# install nodejs
pacman -S --noconfirm --needed nodejs npm && \
# install the compiler and tools
NODE_OPTIONS="--enable-source-maps" \
setup-cpp \
--autoreconf true \
--compiler mingw \
--cmake true \
--ninja true \
--task true \
--vcpkg true \
--python true \
--make true \
--cppcheck true \
--gcovr true \
--doxygen true \
--ccache true && \
# install mingw/powershell
RUN setup-cpp \
--compiler mingw \
--powershell true && \
# arch cleanup
pacman -Scc --noconfirm && \
rm -rf /var/cache/pacman/pkg/* && \
Expand Down
30 changes: 4 additions & 26 deletions dev/docker/ci/fedora-llvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,8 @@
## base image
FROM fedora:44 AS setup-cpp-fedora
FROM aminya/setup-cpp-fedora:latest AS setup-cpp-fedora-llvm

COPY "./dist/modern" "/usr/lib/setup-cpp/"

ENV NODE_OPTIONS="--enable-source-maps"

RUN chmod +x /usr/lib/setup-cpp/setup-cpp.mjs && \
ln -s /usr/lib/setup-cpp/setup-cpp.mjs /usr/local/bin/setup-cpp

# install nodejs
RUN dnf -y install nodejs npm && \
# install the compiler and tools
NODE_OPTIONS="--enable-source-maps" \
setup-cpp \
--autoreconf true \
--compiler llvm \
--cmake true \
--ninja true \
--task true \
--vcpkg true \
--python true \
--make true \
--cppcheck true \
--gcovr true \
--doxygen true \
--ccache true && \
# install llvm
RUN setup-cpp \
--compiler llvm && \
# cleanup
dnf clean all && \
rm -rf /tmp/*
Expand Down
32 changes: 5 additions & 27 deletions dev/docker/ci/fedora-mingw.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,9 @@
## base image
FROM fedora:44 AS setup-cpp-fedora-mingw
FROM aminya/setup-cpp-fedora:latest AS setup-cpp-fedora-mingw

COPY "./dist/modern" "/usr/lib/setup-cpp/"

ENV NODE_OPTIONS="--enable-source-maps"

RUN chmod +x /usr/lib/setup-cpp/setup-cpp.mjs && \
ln -s /usr/lib/setup-cpp/setup-cpp.mjs /usr/local/bin/setup-cpp

# install nodejs
RUN dnf -y install nodejs npm && \
# install the compiler and tools
NODE_OPTIONS="--enable-source-maps" \
setup-cpp \
--autoreconf true \
--compiler mingw \
--cmake true \
--ninja true \
--task true \
--vcpkg true \
--python true \
--make true \
--cppcheck true \
--gcovr true \
--doxygen true \
--ccache true \
--powershell true && \
# install mingw
RUN setup-cpp \
--compiler mingw \
--powershell true && \
# cleanup
dnf clean all && \
rm -rf /tmp/*
Expand Down
43 changes: 6 additions & 37 deletions dev/docker/ci/ubuntu-llvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,11 @@
#### Base Image
FROM ubuntu:22.04 AS setup-cpp-ubuntu
FROM aminya/setup-cpp-ubuntu:latest AS setup-cpp-ubuntu-llvm

COPY "./dist/modern" "/usr/lib/setup-cpp/"

ENV NODE_OPTIONS="--enable-source-maps"

RUN chmod +x /usr/lib/setup-cpp/setup-cpp.mjs && \
ln -s /usr/lib/setup-cpp/setup-cpp.mjs /usr/local/bin/setup-cpp

# install latest nodejs
RUN apt-get update -qq && \
apt-get install -y --no-install-recommends curl gnupg ca-certificates && \
mkdir -p /etc/apt/keyrings && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update -qq && \
apt-get install -y --no-install-recommends nodejs && \
# install the compiler and tools
NODE_OPTIONS="--enable-source-maps" \
setup-cpp \
--autoreconf true \
--nala true \
--compiler llvm \
--cmake true \
--ninja true \
--task true \
--vcpkg true \
--python true \
--make true \
--cppcheck true \
--gcovr true \
--doxygen true \
--ccache true && \
# install llvm
RUN setup-cpp \
--compiler llvm && \
# cleanup
nala autoremove -y && \
nala autopurge -y && \
apt-get clean && \
nala clean --lists && \
apt-get clean autoclean && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/* && \
rm -rf /tmp/*

Expand Down
45 changes: 7 additions & 38 deletions dev/docker/ci/ubuntu-mingw.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,12 @@
#### Base Image
FROM ubuntu:22.04 AS setup-cpp-ubuntu-mingw
FROM aminya/setup-cpp-ubuntu:latest AS setup-cpp-ubuntu-mingw

COPY "./dist/modern" "/usr/lib/setup-cpp/"

ENV NODE_OPTIONS="--enable-source-maps"

RUN chmod +x /usr/lib/setup-cpp/setup-cpp.mjs && \
ln -s /usr/lib/setup-cpp/setup-cpp.mjs /usr/local/bin/setup-cpp

# install latest nodejs
RUN apt-get update -qq && \
apt-get install -y --no-install-recommends curl gnupg ca-certificates && \
mkdir -p /etc/apt/keyrings && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update -qq && \
apt-get install -y --no-install-recommends nodejs && \
# install the compiler and tools
NODE_OPTIONS="--enable-source-maps" \
setup-cpp \
--autoreconf true \
--nala true \
--compiler mingw \
--cmake true \
--ninja true \
--task true \
--vcpkg true \
--python true \
--make true \
--cppcheck true \
--gcovr true \
--doxygen true \
--ccache true \
--powershell true && \
# install mingw/powershell
RUN setup-cpp \
--compiler mingw \
--powershell true && \
# cleanup
nala autoremove -y && \
nala autopurge -y && \
apt-get clean && \
nala clean --lists && \
apt-get clean autoclean && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/* && \
rm -rf /tmp/*

Expand Down
2 changes: 1 addition & 1 deletion dist/legacy/setup-cpp.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/legacy/setup-cpp.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modern/setup-cpp.mjs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modern/setup-cpp.mjs.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading