feat: add separate production and testing docker files

Author: aminya

.dockerignore

@@ -1,5 +1,20 @@
-.parcel-cache/
-node_modules/
-dev/docker/
-dev/container-tests/
-dist/
+.git/
+# OS metadata
+**/.DS_Store
+**/Thumbs.db
+
+# Node
+**/node_modules
+**/package-lock.json
+**/temp-*
+
+# TypeScript
+**/*.tsbuildinfo
+
+# Build directories
+**/packages/*/dist/
+**/.parcel-cache
+**/exe/
+**/*.log
+**/*.exe
+**/.cache/

.github/workflows/CI.yml

@@ -132,10 +132,14 @@ jobs:
       matrix:
         os:
           - ubuntu-22.04
+        node:
+          - 18
+        pnpm:
+          - 8
         container:
-          - "arch_node.dockerfile"
-          - "fedora_node.dockerfile"
-          - "ubuntu_node.dockerfile"
+          - "./dev/docker/__tests__/arch.dockerfile"
+          - "./dev/docker/__tests__/fedora.dockerfile"
+          - "./dev/docker/__tests__/ubuntu.dockerfile"
     steps:
       - uses: actions/checkout@v3
         with:
@@ -151,7 +155,21 @@ jobs:
           restore-keys: |
             "setupcpp-docker-cache-OS:${{ matrix.os }}"
 
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+
+      - name: Setup Pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: ${{ matrix.pnpm }}
+
+      - name: Install and build
+        run: |
+          pnpm install
+
       - name: Build
         id: docker_build
         run: |
-          docker build -f ./dev/docker/${{ matrix.container }} -t setup-cpp .
+          docker build -f ${{ matrix.container }} -t setup-cpp .

README.md

@@ -153,29 +153,29 @@ 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 base
 
-# add setup-cpp
-RUN apt-get update -qq
-RUN apt-get install -y --no-install-recommends npm
-RUN npm install -g setup-cpp
+# install nodejs and setup-cpp
+RUN apt-get update -qq && \
+    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 --make true
+RUN setup-cpp --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --task true
 
-CMD source ~/.cpprc
-ENTRYPOINT [ "/bin/bash" ]
+ENTRYPOINT ["/bin/bash"]
 
-#### Building
-FROM base AS builder
-ADD ./dev/cpp_vcpkg_project /home/app
+#### Building (example)
+FROM base as builder
+COPY ./dev/cpp_vcpkg_project /home/app
 WORKDIR /home/app
 RUN bash -c 'source ~/.cpprc \
-    && make build'
+    && task build'
+
 
 ### Running environment
 # use a distroless image or ubuntu:22.04 if you wish
-FROM gcr.io/distroless/cc
+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/
@@ -217,7 +217,7 @@ jobs:
       - name: Build
         id: docker_build
         run: |
-          docker build -f ./dev/docker/debian.dockerfile -t setup-cpp .
+          docker build -f ./dev/docker/ubuntu.dockerfile -t setup-cpp .
 ```
 
 ### Inside GitLab pipelines

dev/docker/arch_node.dockerfile renamed to dev/docker/__tests__/arch.dockerfile

@@ -1,28 +1,18 @@
 ## base image
 FROM archlinux as base
 
-# install nodejs and pnpm
-RUN pacman -Syuu --noconfirm && pacman-db-upgrade && pacman -S --noconfirm --needed nodejs npm git \
-    && npm install -g pnpm
+# 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/node18" "/"
 
-#### Building
-FROM base AS builder
-## https://github.com/ever0de/pnpm-docker-root-bug#how-to-fix
-WORKDIR /workspace
-COPY . .
-RUN pnpm install
-
-
-#### setup-cpp
-FROM base AS setup-cpp
-# add setup-cpp.js
-COPY --from=builder /workspace/dist/node18 /
 # 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
-CMD ["source", "~/.cpprc"]
-ENTRYPOINT ["/bin/bash"]
+RUN node /setup-cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true
 
+ENTRYPOINT ["/bin/bash"]
 
 #### Building (example)
 FROM setup-cpp AS example-builder
@@ -31,7 +21,6 @@ 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

dev/container-tests/arch.yml renamed to dev/docker/__tests__/arch.yml

@@ -1,28 +1,17 @@
 ## base image
 FROM fedora as base
 
-# nodejs and curl for downloading setup-cpp
-RUN dnf -y install nodejs npm curl git && dnf clean all \
-    && npm install -g pnpm
+# 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/node18" "/"
 
-#### Building
-FROM base AS builder
-## https://github.com/ever0de/pnpm-docker-root-bug#how-to-fix
-WORKDIR /workspace
-COPY . .
-RUN pnpm install
-
-
-#### setup-cpp
-FROM base AS setup-cpp
-# add setup-cpp.js
-COPY --from=builder /workspace/dist/node18 /
 # 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
-CMD ["source", "~/.cpprc"]
-ENTRYPOINT ["/bin/bash"]
 
+ENTRYPOINT ["/bin/bash"]
 
 #### Building (example)
 FROM setup-cpp AS example-builder
@@ -31,7 +20,6 @@ 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

dev/docker/fedora_node.dockerfile renamed to dev/docker/__tests__/fedora.dockerfile

@@ -0,0 +1,30 @@
+#### Base Image
+FROM ubuntu:22.04 as base
+
+# 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/node18" "/"
+
+# install setup-cpp
+RUN node /setup-cpp.js --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --task true
+
+ENTRYPOINT ["/bin/bash"]
+
+#### Building
+FROM base 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
+# copy the built binaries and their runtime dependencies
+COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
+WORKDIR /home/app/
+ENTRYPOINT ["./my_exe"]

dev/container-tests/fedora.yml renamed to dev/docker/__tests__/fedora.yml

@@ -0,0 +1,28 @@
+## 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
+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
+# copy the built binaries and their runtime dependencies
+COPY --from=example-builder /home/app/build/my_exe/Release/ /home/app/
+WORKDIR /home/app/
+ENTRYPOINT ["./my_exe"]