Skip to content

fix: use the modern bundle in the docker images #353

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
Mar 2, 2025
Merged

fix: use the modern bundle in the docker images #353

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
2 changes: 1 addition & 1 deletion dev/docker/ci/arch-gcc.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM --platform=$BUILDPLATFORM aminya/setup-cpp-arch:latest AS setup-cpp-arch-gcc

# install llvm
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
--compiler gcc && \
# arch cleanup
pacman -Scc --noconfirm && \
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/ci/arch-llvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM --platform=$BUILDPLATFORM aminya/setup-cpp-arch:latest AS setup-cpp-arch-llvm

# install llvm
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
--compiler llvm && \
# arch cleanup
pacman -Scc --noconfirm && \
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/ci/arch-mingw.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM --platform=$BUILDPLATFORM aminya/setup-cpp-arch:latest AS setup-cpp-arch-mingw

# install mingw/powershell
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
--compiler mingw \
--powershell true && \
# arch cleanup
Expand Down
4 changes: 2 additions & 2 deletions dev/docker/ci/arch.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ RUN pacman -Syuu --noconfirm && \

FROM --platform=$BUILDPLATFORM arch-nodejs AS setup-cpp-arch

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

# install the cpp tools
RUN pacman -Syuu --noconfirm && \
pacman-db-upgrade && \
node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
--cmake true \
--ninja true \
--task true \
Expand Down
4 changes: 2 additions & 2 deletions dev/docker/ci/docker-ci.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ async function main() {
const dockerFileContent = await readFile(`./dev/docker/setup-cpp/setup-cpp-${name}.dockerfile`, "utf-8")
const modifiedDockerFile = dockerFileContent
// load the externally built setup-cpp
.replace(/FROM (.*)/g, `FROM $1\n\nCOPY "./dist/legacy" "/usr/lib/setup-cpp/"`)
.replace("setup-cpp ", "node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js ")
.replace(/FROM (.*)/g, `FROM $1\n\nCOPY "./dist/modern" "/usr/lib/setup-cpp/"`)
.replace("setup-cpp ", "node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs ")
// remove the npm install line
.replace(/# install setup-cpp\n\s*npm install -g setup-cpp.*\n/, "")

Expand Down
2 changes: 1 addition & 1 deletion dev/docker/ci/fedora-gcc.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM --platform=$BUILDPLATFORM aminya/setup-cpp-fedora:latest AS setup-cpp-fedora-gcc

# install gcc
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
--compiler gcc && \
# cleanup
dnf clean all && \
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/ci/fedora-llvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM --platform=$BUILDPLATFORM aminya/setup-cpp-fedora:latest AS setup-cpp-fedora-llvm

# install llvm
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
--compiler llvm && \
# cleanup
dnf clean all && \
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/ci/fedora-mingw.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM --platform=$BUILDPLATFORM aminya/setup-cpp-fedora:latest AS setup-cpp-fedora-mingw

# install mingw
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
--compiler mingw \
--powershell true && \
# cleanup
Expand Down
4 changes: 2 additions & 2 deletions dev/docker/ci/fedora.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ RUN dnf -y install nodejs npm && \

FROM --platform=$BUILDPLATFORM fedora-nodejs AS setup-cpp-fedora

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

# install the cpp tools
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
--cmake true \
--ninja true \
--task true \
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/ci/ubuntu-gcc.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM --platform=$BUILDPLATFORM aminya/setup-cpp-ubuntu:latest AS setup-cpp-ubuntu-gcc

# install gcc
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
--compiler gcc && \
# cleanup
nala autoremove -y && \
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/ci/ubuntu-llvm.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM --platform=$BUILDPLATFORM aminya/setup-cpp-ubuntu:latest AS setup-cpp-ubuntu-llvm

# install llvm
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
--compiler llvm && \
# cleanup
nala autoremove -y && \
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/ci/ubuntu-mingw.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM --platform=$BUILDPLATFORM aminya/setup-cpp-ubuntu:latest AS setup-cpp-ubuntu-mingw

# install mingw/powershell
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
--compiler mingw \
--powershell true && \
# cleanup
Expand Down
4 changes: 2 additions & 2 deletions dev/docker/ci/ubuntu.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ RUN apt-get update -qq && \
#### Base Image with Tools
FROM --platform=$BUILDPLATFORM ubuntu-nodejs AS setup-cpp-ubuntu

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

# install the cpp tools
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
--nala true \
--cmake true \
--ninja true \
Expand Down
Loading