Run test within Dockerfile

bthomee · bthomee · commit e1e488e938de · 2025-07-09T12:33:53.000-04:00
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -104,7 +104,8 @@ jobs:
             GCOVR_VERSION=${{ env.GCOVR_VERSION }}
             NONROOT_USER=${{ env.NONROOT_USER }}
             DEBIAN_VERSION=${{ matrix.os.release }}
-          context: docker/debian
+          context: .
+          file: docker/debian/Dockerfile
           outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
           platforms: ${{ matrix.architecture.platform }}
           provenance: mode=max
@@ -113,10 +114,6 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           target: ${{ matrix.os.compiler_name }}
           tags: ${{ env.CONTAINER_IMAGE }}
-      - name: Test the Docker image
-        if: ${{ github.ref_type == 'branch' && github.ref_name != github.event.repository.default_branch }}
-        run: |
-          docker run --rm -v ${{ github.workspace }}/test:/tmp:ro ${{ env.CONTAINER_IMAGE }} /tmp/run.sh
       - name: Export digest
         if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
         shell: bash
diff --git a/.github/workflows/rhel.yml b/.github/workflows/rhel.yml
@@ -94,7 +94,8 @@ jobs:
             GCOVR_VERSION=${{ env.GCOVR_VERSION }}
             NONROOT_USER=${{ env.NONROOT_USER }}
             RHEL_VERSION=${{ matrix.os.release }}
-          context: docker/rhel
+          context: .
+          file: docker/rhel/Dockerfile
           outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
           platforms: ${{ matrix.architecture.platform }}
           provenance: mode=max
@@ -103,10 +104,6 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           target: ${{ matrix.os.compiler_name }}
           tags: ${{ env.CONTAINER_IMAGE }}
-      - name: Test the Docker image
-        if: ${{ github.ref_type == 'branch' && github.ref_name != github.event.repository.default_branch }}
-        run: |
-          docker run --rm -v ${{ github.workspace }}/test:/tmp:ro ${{ env.CONTAINER_IMAGE }} /tmp/run.sh
       - name: Export digest
         if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
         shell: bash
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -102,7 +102,8 @@ jobs:
             GCOVR_VERSION=${{ env.GCOVR_VERSION }}
             NONROOT_USER=${{ env.NONROOT_USER }}
             UBUNTU_VERSION=${{ matrix.os.release }}
-          context: docker/ubuntu
+          context: .
+          file: docker/ubuntu/Dockerfile
           outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
           platforms: ${{ matrix.architecture.platform }}
           provenance: mode=max
@@ -111,10 +112,6 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           target: ${{ matrix.os.compiler_name }}
           tags: ${{ env.CONTAINER_IMAGE }}
-      - name: Test the Docker image
-        if: ${{ github.ref_type == 'branch' && github.ref_name != github.event.repository.default_branch }}
-        run: |
-          docker run --rm -v ${{ github.workspace }}/test:/tmp:ro ${{ env.CONTAINER_IMAGE }} /tmp/run.sh
       - name: Export digest
         if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
         shell: bash
diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
@@ -115,6 +115,13 @@ EOF
 # Print the Conan profile to verify the configuration.
 RUN conan profile show
 
+# Test the image by compiling a simple C++ program.
+RUN --mount=type=bind,source=test,target=/test,readonly <<EOF
+cp -r /test test
+cd test && ./run.sh && cd ..
+rm -rf test
+EOF
+
 # ===================== CLANG IMAGE =====================
 FROM base AS clang
 
@@ -165,3 +172,10 @@ fi
 EOF
 # Print the Conan profile to verify the configuration.
 RUN conan profile show
+
+# Test the image by compiling a simple C++ program.
+RUN --mount=type=bind,source=test,target=/test,readonly <<EOF
+cp -r /test test
+cd test && ./run.sh && cd ..
+rm -rf test
+EOF
diff --git a/docker/debian/README.md b/docker/debian/README.md
@@ -29,7 +29,7 @@ versions by specifying the `DEBIAN_VERSION` build argument. There are additional
 arguments to specify as well, namely `GCC_VERSION` for the GCC flavor and
 `CLANG_VERSION` for the Clang flavor.
 
-Run the commands below from the current directory containing the Dockerfile.
+Run the commands below from the root directory of the repository.
 
 #### Building the Docker image for GCC.
 
@@ -45,6 +45,7 @@ GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:gcc-${GCC_VERSION}
 
 docker buildx build . \
+  --file docker/debian/Dockerfile \
   --target gcc \
   --build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
@@ -70,6 +71,7 @@ GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:clang-${CLANG_VERSION}
 
 docker buildx build . \
+  --file docker/debian/Dockerfile \
   --target clang \
   --build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
diff --git a/docker/rhel/Dockerfile b/docker/rhel/Dockerfile
@@ -86,6 +86,13 @@ EOF
 # Print the Conan profile to verify the configuration.
 RUN conan profile show
 
+# Test the image by compiling a simple C++ program.
+RUN --mount=type=bind,source=test,target=/test,readonly <<EOF
+cp -r /test test
+cd test && ./run.sh && cd ..
+rm -rf test
+EOF
+
 # ===================== CLANG IMAGE =====================
 FROM base AS clang
 
@@ -132,3 +139,10 @@ fi
 EOF
 # Print the Conan profile to verify the configuration.
 RUN conan profile show
+
+# Test the image by compiling a simple C++ program.
+RUN --mount=type=bind,source=test,target=/test,readonly <<EOF
+cp -r /test test
+cd test && ./run.sh && cd ..
+rm -rf test
+EOF
diff --git a/docker/rhel/README.md b/docker/rhel/README.md
@@ -48,7 +48,7 @@ versions by specifying the `RHEL_VERSION` build argument. There are additional
 arguments to specify as well, namely `GCC_VERSION` for the GCC flavor and
 `CLANG_VERSION` for the Clang flavor.
 
-Run the commands below from the current directory containing the Dockerfile.
+Run the commands below from the root directory of the repository.
 
 #### Building the Docker image for GCC.
 
@@ -64,6 +64,7 @@ GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:gcc-${GCC_VERSION}
 
 docker buildx build . \
+  --file docker/rhel/Dockerfile \
   --target gcc \
   --build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
@@ -88,6 +89,7 @@ GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:clang-${CLANG_VERSION}
 
 docker buildx build . \
+  --file docker/rhel/Dockerfile \
   --target clang \
   --build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
@@ -109,6 +109,13 @@ EOF
 # Print the Conan profile to verify the configuration.
 RUN conan profile show
 
+# Test the image by compiling a simple C++ program.
+RUN --mount=type=bind,source=test,target=/test,readonly <<EOF
+cp -r /test test
+cd test && ./run.sh && cd ..
+rm -rf test
+EOF
+
 # ===================== CLANG IMAGE =====================
 FROM base AS clang
 
@@ -154,3 +161,10 @@ fi
 EOF
 # Print the Conan profile to verify the configuration.
 RUN conan profile show
+
+# Test the image by compiling a simple C++ program.
+RUN --mount=type=bind,source=test,target=/test,readonly <<EOF
+cp -r /test test
+cd test && ./run.sh && cd ..
+rm -rf test
+EOF
diff --git a/docker/ubuntu/README.md b/docker/ubuntu/README.md
@@ -29,7 +29,7 @@ future versions by specifying the `UBUNTU_VERSION` build argument. There are
 additional arguments to specify as well, namely `GCC_VERSION` for the GCC flavor
 and `CLANG_VERSION` for the Clang flavor.
 
-Run the commands below from the current directory containing the Dockerfile.
+Run the commands below from the root directory of the repository.
 
 #### Building the Docker image for GCC.
 
@@ -45,6 +45,7 @@ GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:gcc-${GCC_VERSION}
 
 docker buildx build . \
+  --file docker/ubuntu/Dockerfile \
   --target gcc \
   --build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
@@ -70,6 +71,7 @@ GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:clang-${CLANG_VERSION}
 
 docker buildx build . \
+  --file docker/ubuntu/Dockerfile \
   --target clang \
   --build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.15)
-project(compressor C)
+project(example C)
 
 find_package(ZLIB REQUIRED)
 
diff --git a/test/run.sh b/test/run.sh
@@ -2,15 +2,11 @@
 
 set -ex
 
-# Copy the test code, as we do not want to modify the directory.
-cp -r /tmp test
-cd test
-
-# Install Conan dependencies and build the project.
+# Install Conan dependencies, configure the project, and build the executable.
 conan install . --output-folder=build --build=missing
 cd build
 cmake .. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
 cmake --build .
 
-# Run the compressor executable.
-./compressor
+# Run the executable.
+./example
