Merge pull request #181 from aminya/docker

Author: aminya

.github/workflows/CI.yml

@@ -172,6 +172,7 @@ jobs:
       - name: Install and build
         run: |
           pnpm install
+          pnpm build.docker_tests
 
       - name: Build
         id: docker_build

README.md

@@ -153,29 +153,49 @@ Here is an example for using setup-cpp to make a builder image that has the Cpp
 
 ```dockerfile
 #### Base Image
-FROM ubuntu:22.04 as base
+FROM ubuntu:22.04 as setup-cpp-ubuntu
 
-# install nodejs and setup-cpp
 RUN apt-get update -qq && \
+    # install nodejs
     apt-get install -y --no-install-recommends nodejs npm && \
-    npm install -g setup-cpp
-
-# install llvm, cmake, ninja, and ccache
-RUN setup-cpp --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --task true
+    # install setup-cpp
+    npm install -g [email protected] && \
+    # install the compiler and tools
+    setup-cpp \
+        --nala true \
+        --compiler llvm \
+        --cmake true \
+        --ninja true \
+        --task true \
+        --vcpkg true \
+        --python true \
+        --make true \
+        --cppcheck true \
+        --gcovr true \
+        --doxygen true \
+        --ccache true && \
+    # cleanup
+    nala autoremove -y && \
+    nala autopurge -y && \
+    apt-get clean && \
+    nala clean --lists && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/*
 
 ENTRYPOINT ["/bin/bash"]
 
 #### Building (example)
-FROM base as builder
+FROM setup-cpp-ubuntu AS builder
+
 COPY ./dev/cpp_vcpkg_project /home/app
 WORKDIR /home/app
 RUN bash -c 'source ~/.cpprc \
     && task build'
 
+#### Running environment
+# use a fresh image as the runner
+FROM ubuntu:22.04 as runner
 
-### Running environment
-# use a distroless image or ubuntu:22.04 if you wish
-FROM gcr.io/distroless/cc as runner
 # copy the built binaries and their runtime dependencies
 COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
 WORKDIR /home/app/
@@ -189,7 +209,7 @@ If you want to build the ones included, then run:
 ```shell
 git clone --recurse-submodules https://github.com/aminya/setup-cpp
 cd ./setup-cpp
-docker build -f ./dev/docker/ubuntu.dockerfile -t setup-cpp .
+docker build -f ./dev/docker/setup-cpp-ubuntu.dockerfile -t setup-cpp .
 ```
 
 Where you should use the path to the dockerfile after `-f`.

dev/docker/__tests__/arch.dockerfile

@@ -1,30 +1,47 @@
 ## base image
-FROM archlinux as base
+FROM archlinux:base as setup-cpp-arch
+
+COPY "./dist/legacy" "/usr/lib/setup-cpp/"
 
-# install nodejs
 RUN pacman -Syuu --noconfirm && \
     pacman-db-upgrade && \
-    pacman -S --noconfirm --needed nodejs
-
-# add setup-cpp.js (built outside of this dockerfile)
-COPY "./dist/legacy" "/"
-
-# run installation
-RUN node /setup-cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true
+    # install nodejs
+    pacman -S --noconfirm --needed nodejs npm && \
+    # install setup-cpp
+    npm install -g [email protected] && \
+    # install the compiler and tools
+    node /usr/lib/setup-cpp/setup-cpp.js \
+        --compiler llvm \
+        --cmake true \
+        --ninja true \
+        --task true \
+        --vcpkg true \
+        --python true \
+        --make true \
+        --cppcheck true \
+        --gcovr true \
+        --doxygen true \
+        --ccache true && \
+    # arch cleanup
+    pacman -Scc --noconfirm && \
+    rm -rf /var/cache/pacman/pkg/* && \
+    rm -rf /tmp/*
 
 ENTRYPOINT ["/bin/bash"]
 
 #### Building (example)
-FROM base AS example-builder
+FROM setup-cpp-arch AS builder
+
 COPY ./dev/cpp_vcpkg_project /home/app
 WORKDIR /home/app
 RUN bash -c 'source ~/.cpprc \
     && task build'
 
 #### Running environment
-# use a distroless image or ubuntu:22.04 if you wish
-FROM gcr.io/distroless/cc as runner
+# use a fresh image as the runner
+FROM archlinux:base as runner
+
 # copy the built binaries and their runtime dependencies
-COPY --from=example-builder /home/app/build/my_exe/Release/ /home/app/
+COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
 WORKDIR /home/app/
 ENTRYPOINT ["./my_exe"]

dev/docker/__tests__/fedora.dockerfile

@@ -1,29 +1,44 @@
 ## base image
-FROM fedora as base
+FROM fedora:38 as setup-cpp-fedora
 
-# install nodejs and setup-cpp
-RUN dnf -y install nodejs npm && \
-    npm install -g setup-cpp
-
-# add setup-cpp.js (built outside of this dockerfile)
-COPY "./dist/legacy" "/"
+COPY "./dist/legacy" "/usr/lib/setup-cpp/"
 
-# run installation
-RUN node /setup-cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true --powershell true
+# install nodejs
+RUN dnf -y install nodejs npm && \
+    # install setup-cpp
+    npm install -g [email protected] && \
+    # install the compiler and tools
+    node /usr/lib/setup-cpp/setup-cpp.js \
+        --compiler llvm \
+        --cmake true \
+        --ninja true \
+        --task true \
+        --vcpkg true \
+        --python true \
+        --make true \
+        --cppcheck true \
+        --gcovr true \
+        --doxygen true \
+        --ccache true && \
+    # cleanup
+    dnf clean all && \
+    rm -rf /tmp/*
 
 ENTRYPOINT ["/bin/bash"]
 
 #### Building (example)
-FROM base AS example-builder
+FROM setup-cpp-fedora AS builder
+
 COPY ./dev/cpp_vcpkg_project /home/app
 WORKDIR /home/app
 RUN bash -c 'source ~/.cpprc \
     && task build'
 
 #### Running environment
-# use a distroless image or ubuntu:22.04 if you wish
-FROM gcr.io/distroless/cc as runner
+# use a fresh image as the runner
+FROM fedora:38 as runner
+
 # copy the built binaries and their runtime dependencies
-COPY --from=example-builder /home/app/build/my_exe/Release/ /home/app/
+COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
 WORKDIR /home/app/
 ENTRYPOINT ["./my_exe"]

dev/docker/__tests__/ubuntu.dockerfile

@@ -1,29 +1,49 @@
 #### Base Image
-FROM ubuntu:22.04 as base
+FROM ubuntu:22.04 as setup-cpp-ubuntu
 
-# install nodejs and setup-cpp
-RUN apt-get update -qq && \
-    apt-get install -y --no-install-recommends nodejs
-
-# add setup-cpp.js (built outside of this dockerfile)
-COPY "./dist/legacy" "/"
+COPY "./dist/legacy" "/usr/lib/setup-cpp/"
 
-# install setup-cpp
-RUN node /setup-cpp.js --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --task true
+RUN apt-get update -qq && \
+    # install nodejs
+    apt-get install -y --no-install-recommends nodejs npm && \
+    # install setup-cpp
+    npm install -g [email protected] && \
+    # install the compiler and tools
+    node /usr/lib/setup-cpp/setup-cpp.js \
+        --nala true \
+        --compiler llvm \
+        --cmake true \
+        --ninja true \
+        --task true \
+        --vcpkg true \
+        --python true \
+        --make true \
+        --cppcheck true \
+        --gcovr true \
+        --doxygen true \
+        --ccache true && \
+    # cleanup
+    nala autoremove -y && \
+    nala autopurge -y && \
+    apt-get clean && \
+    nala clean --lists && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/*
 
 ENTRYPOINT ["/bin/bash"]
 
-#### Building
-FROM base as builder
+#### Building (example)
+FROM setup-cpp-ubuntu AS builder
+
 COPY ./dev/cpp_vcpkg_project /home/app
 WORKDIR /home/app
 RUN bash -c 'source ~/.cpprc \
     && task build'
 
+#### Running environment
+# use a fresh image as the runner
+FROM ubuntu:22.04 as runner
 
-### Running environment
-# use a distroless image or ubuntu:22.04 if you wish
-FROM gcr.io/distroless/cc as runner
 # copy the built binaries and their runtime dependencies
 COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
 WORKDIR /home/app/

dev/docker/arch.dockerfile

@@ -1,28 +1,16 @@
-## base image
-FROM archlinux as base
-
-# install nodejs and setup-cpp
-RUN pacman -Syuu --noconfirm && \
-    pacman-db-upgrade && \
-    pacman -S --noconfirm --needed nodejs npm && \
-    npm install -g setup-cpp
-
-# run installation
-RUN setup-cpp --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true
-
-ENTRYPOINT ["/bin/bash"]
-
 #### Building (example)
-FROM base AS example-builder
+FROM setup-cpp-arch AS builder
+
 COPY ./dev/cpp_vcpkg_project /home/app
 WORKDIR /home/app
 RUN bash -c 'source ~/.cpprc \
     && task build'
 
 #### Running environment
-# use a distroless image or ubuntu:22.04 if you wish
-FROM gcr.io/distroless/cc as runner
+# use a fresh image as the runner
+FROM archlinux:base as runner
+
 # copy the built binaries and their runtime dependencies
-COPY --from=example-builder /home/app/build/my_exe/Release/ /home/app/
+COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
 WORKDIR /home/app/
 ENTRYPOINT ["./my_exe"]

dev/docker/fedora.dockerfile

@@ -1,26 +1,16 @@
-## base image
-FROM fedora as base
-
-# install nodejs and setup-cpp
-RUN dnf -y install nodejs npm && \
-    npm install -g setup-cpp
-
-# run installation
-RUN setup-cpp --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true --powershell true
-
-ENTRYPOINT ["/bin/bash"]
-
 #### Building (example)
-FROM base AS example-builder
+FROM setup-cpp-fedora AS builder
+
 COPY ./dev/cpp_vcpkg_project /home/app
 WORKDIR /home/app
 RUN bash -c 'source ~/.cpprc \
     && task build'
 
 #### Running environment
-# use a distroless image or ubuntu:22.04 if you wish
-FROM gcr.io/distroless/cc as runner
+# use a fresh image as the runner
+FROM fedora:38 as runner
+
 # copy the built binaries and their runtime dependencies
-COPY --from=example-builder /home/app/build/my_exe/Release/ /home/app/
+COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
 WORKDIR /home/app/
 ENTRYPOINT ["./my_exe"]

dev/docker/setup-cpp-arch.dockerfile

@@ -0,0 +1,28 @@
+## base image
+FROM archlinux:base as setup-cpp-arch
+
+RUN pacman -Syuu --noconfirm && \
+    pacman-db-upgrade && \
+    # install nodejs
+    pacman -S --noconfirm --needed nodejs npm && \
+    # install setup-cpp
+    npm install -g [email protected] && \
+    # install the compiler and tools
+    setup-cpp \
+        --compiler llvm \
+        --cmake true \
+        --ninja true \
+        --task true \
+        --vcpkg true \
+        --python true \
+        --make true \
+        --cppcheck true \
+        --gcovr true \
+        --doxygen true \
+        --ccache true && \
+    # arch cleanup
+    pacman -Scc --noconfirm && \
+    rm -rf /var/cache/pacman/pkg/* && \
+    rm -rf /tmp/*
+
+ENTRYPOINT ["/bin/bash"]

dev/docker/setup-cpp-fedora.dockerfile

@@ -0,0 +1,25 @@
+## base image
+FROM fedora:38 as setup-cpp-fedora
+
+# install nodejs
+RUN dnf -y install nodejs npm && \
+    # install setup-cpp
+    npm install -g [email protected] && \
+    # install the compiler and tools
+    setup-cpp \
+        --compiler llvm \
+        --cmake true \
+        --ninja true \
+        --task true \
+        --vcpkg true \
+        --python true \
+        --make true \
+        --cppcheck true \
+        --gcovr true \
+        --doxygen true \
+        --ccache true && \
+    # cleanup
+    dnf clean all && \
+    rm -rf /tmp/*
+
+ENTRYPOINT ["/bin/bash"]