Ci next

.github/workflows/main.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     outputs:
-      distros: ${{ steps.set-matrix.outputs.distros }}
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
 
     steps:
       - uses: actions/checkout@v7
@@ -23,18 +23,19 @@ jobs:
           DISTROS=$(find . -maxdepth 1 -name '*.docker.m4' \
             | sed 's|^\./||' \
             | sed 's|\.docker\.m4$||' \
+            | grep -Ev '(-dev|-pkcs11)$' \
             | jq -R -s -c 'split("\n")[:-1]')
 
-          echo "distros=$DISTROS" >> $GITHUB_OUTPUT
+          MATRIX=$(jq -cn --argjson distros "$DISTROS" '{distro: $distros}')
+          echo "matrix=$MATRIX" >> $GITHUB_OUTPUT
 
   build-image:
     name: Build Docker Images
     needs: generate-matrix
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        distro: ${{ fromJson(needs.generate-matrix.outputs.distros) }}
+      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
     steps:
       -
         name: Check out the repo
@@ -47,6 +48,8 @@ jobs:
           filters: |
             build:
               - ${{ matrix.distro }}.docker.m4
+              - ${{ matrix.distro }}-dev.docker.m4
+              - ${{ matrix.distro }}-pkcs11.docker.m4
               - modules/*
       -
         name: Build the Dockerfiles
@@ -68,3 +71,19 @@ jobs:
           context: .
           file: ./${{ matrix.distro }}.docker
         if: steps.changes.outputs.build == 'true'
+      -
+        name: Build Docker Images (-dev)
+        uses: docker/build-push-action@v7
+        with:
+          push: false
+          context: .
+          file: ./${{ matrix.distro }}-dev.docker
+        if: steps.changes.outputs.build == 'true' && hashFiles(format('{0}-dev.docker.m4', matrix.distro)) != ''
+      -
+        name: Build Docker Images (-pkcs11)
+        uses: docker/build-push-action@v7
+        with:
+          push: false
+          context: .
+          file: ./${{ matrix.distro }}-pkcs11.docker
+        if: steps.changes.outputs.build == 'true' && hashFiles(format('{0}-pkcs11.docker.m4', matrix.distro)) != ''

.github/workflows/publish.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
 
     outputs:
-      distros: ${{ steps.set-matrix.outputs.distros }}
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
 
     steps:
       - uses: actions/checkout@v7
@@ -24,18 +24,19 @@ jobs:
           DISTROS=$(find . -maxdepth 1 -name '*.docker.m4' \
             | sed 's|^\./||' \
             | sed 's|\.docker\.m4$||' \
+            | grep -Ev '(-dev|-pkcs11)$' \
             | jq -R -s -c 'split("\n")[:-1]')
 
-          echo "distros=$DISTROS" >> $GITHUB_OUTPUT
+          MATRIX=$(jq -cn --argjson distros "$DISTROS" '{distro: $distros}')
+          echo "matrix=$MATRIX" >> $GITHUB_OUTPUT
 
   publish-image:
     name: Publish Docker Images
     needs: generate-matrix
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        distro: ${{ fromJson(needs.generate-matrix.outputs.distros) }}
+      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
 
     if: "github.repository_owner == 'tpm2-software'"
     steps:
@@ -50,6 +51,8 @@ jobs:
           filters: |
             build:
               - ${{ matrix.distro }}.docker.m4
+              - ${{ matrix.distro }}-dev.docker.m4
+              - ${{ matrix.distro }}-pkcs11.docker.m4
               - modules/*
       -
         name: Build the Dockerfiles
@@ -80,3 +83,21 @@ jobs:
           file: ./${{ matrix.distro }}.docker
           tags: ghcr.io/${{ github.repository_owner }}/${{ matrix.distro }}:latest
         if: steps.changes.outputs.build == 'true'
+      -
+        name: Push -dev to GitHub Packages
+        uses: docker/build-push-action@v7
+        with:
+          push: 'true'
+          context: .
+          file: ./${{ matrix.distro }}-dev.docker
+          tags: ghcr.io/${{ github.repository_owner }}/${{ matrix.distro }}-dev:latest
+        if: steps.changes.outputs.build == 'true' && hashFiles(format('{0}-dev.docker.m4', matrix.distro)) != ''
+      -
+        name: Push -pkcs11 to GitHub Packages
+        uses: docker/build-push-action@v7
+        with:
+          push: 'true'
+          context: .
+          file: ./${{ matrix.distro }}-pkcs11.docker
+          tags: ghcr.io/${{ github.repository_owner }}/${{ matrix.distro }}-pkcs11:latest
+        if: steps.changes.outputs.build == 'true' && hashFiles(format('{0}-pkcs11.docker.m4', matrix.distro)) != ''

README.md

@@ -53,3 +53,19 @@ docker run -it --rm ghcr.io/tpm2-software/fedora-32 /bin/bash
 # With Podman
 podman run -it --rm ghcr.io/tpm2-software/fedora-32 /bin/bash
 ```
+
+## Structure
+
+Standard distro/version images have profile-tag variants using the same base name:
+
+- `<distro>-<version>-dev`
+- `<distro>-<version>-pkcs11`
+
+This intentionally excludes architecture-specific tags and specialized images such as
+`*-mbedtls-*`, which remain single-purpose variants.
+
+Profile intent:
+
+- base tag (`<distro>-<version>`): lean/default CI dependencies
+- dev tag (`<distro>-<version>-dev`): base plus development/tooling extras
+- pkcs11 tag (`<distro>-<version>-pkcs11`): dev plus pkcs11/python/java extras

alpine-3.23-dev.docker.m4

@@ -0,0 +1,4 @@
+# Alpine 3.23 Dockerfile
+include(`alpine-3.23.docker.m4')
+
+include(`alpine_dev_extras.m4')

alpine-3.23-pkcs11.docker.m4

@@ -0,0 +1,5 @@
+# Alpine 3.23 Dockerfile
+include(`alpine-3.23-dev.docker.m4')
+
+include(`alpine_pkcs11_extras.m4')
+include(`junit.m4')

alpine-3.23.docker.m4

@@ -0,0 +1,11 @@
+# Alpine 3.23 Dockerfile
+FROM alpine:3.23
+
+LABEL org.opencontainers.image.source="https://github.com/tpm2-software/tpm2-software-container"
+
+include(`alpine_base_deps.m4')
+
+include(`ibmtpm1682.m4')
+include(`swtpm.m4')
+
+WORKDIR /

alpine-3.24-dev.docker.m4

@@ -0,0 +1,4 @@
+# Alpine 3.24 Dockerfile
+include(`alpine-3.24.docker.m4')
+
+include(`alpine_dev_extras.m4')

alpine-3.24-pkcs11.docker.m4

@@ -0,0 +1,5 @@
+# Alpine 3.24 Dockerfile
+include(`alpine-3.24-dev.docker.m4')
+
+include(`alpine_pkcs11_extras.m4')
+include(`junit.m4')

alpine-3.24.docker.m4

@@ -0,0 +1,11 @@
+# Alpine 3.24 Dockerfile
+FROM alpine:3.24
+
+LABEL org.opencontainers.image.source="https://github.com/tpm2-software/tpm2-software-container"
+
+include(`alpine_base_deps.m4')
+
+include(`ibmtpm1682.m4')
+include(`swtpm.m4')
+
+WORKDIR /

arch-linux-dev.docker.m4

@@ -0,0 +1,4 @@
+# Arch Linux Dockerfile
+include(`arch-linux.docker.m4')
+
+include(`arch_linux_dev_extras.m4')

arch-linux-pkcs11.docker.m4

@@ -0,0 +1,5 @@
+# Arch Linux Dockerfile
+include(`arch-linux-dev.docker.m4')
+
+include(`arch_linux_pkcs11_extras.m4')
+include(`junit.m4')

arch-linux.docker.m4

@@ -1,45 +1,9 @@
-# Alpine 3.19 Dockerfile
+# Arch Linux Dockerfile
 FROM archlinux:latest
 
 LABEL org.opencontainers.image.source=https://github.com/tpm2-software/tpm2-software-container
 
-RUN pacman -Sy --noconfirm archlinux-keyring 
-RUN pacman -Syu --noconfirm
-RUN pacman -S --noconfirm base base-devel
-RUN pacman -Scc --noconfirm
-RUN pacman -Sy --noconfirm \
-    autoconf-archive \
-    cmocka \
-    procps \
-    iproute2 \
-    git \
-    pkg-config \
-    gcc \
-    libtool \
-    automake \
-    openssl \
-    uthash \
-    autoconf \
-    doxygen \
-    json-c \
-    curl \
-    util-linux \
-    libltdl \
-    libusb \
-    libftdi \
-    swtpm \
-    pkgfile \
-    glib2 \
-    glib2-devel \
-    python-yaml \
-    xxd \
-    expect \
-    perl \
-    pandoc \
-    lcov \
-    wget
-RUN ln -s /usr/bin/core_perl/shasum /usr/bin/
+include(`arch_linux_base_deps.m4')
 include(`ibmtpm1682.m4')
 
 WORKDIR /
-

centos-stream10-dev.docker.m4

@@ -0,0 +1,3 @@
+include(`centos-stream10.docker.m4')
+
+include(`centos_dev_extras.m4')

centos-stream10-pkcs11.docker.m4

@@ -0,0 +1,5 @@
+include(`centos-stream10-dev.docker.m4')
+
+include(`centos_pkcs11_extras.m4')
+
+ENV CLASSPATH=/usr/share/java/hamcrest/hamcrest.jar:/usr/share/java/junit.jar

centos-stream10.docker.m4

@@ -0,0 +1,17 @@
+FROM quay.io/centos/centos:stream10
+
+LABEL org.opencontainers.image.source="https://github.com/tpm2-software/tpm2-software-container"
+
+define(`CENTOS_JAVA', `java-21-openjdk java-21-openjdk-devel')dnl
+define(`CENTOS_LIBUSB_DEVEL', `libusb1-devel')dnl
+define(`CENTOS_OPENSSL_PKCS11', `')dnl
+include(`centos_base_deps.m4')
+include(`ibmtpm1682.m4')
+include(`swtpm.m4')
+
+# make install goes into /usr/local/lib/pkgconfig which is non-standard
+# Set this so ./configure can find things and we don't have to worry about prefix changes
+# to build instructions
+ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+
+WORKDIR /

centos-stream9-dev.docker.m4

@@ -0,0 +1,3 @@
+include(`centos-stream9.docker.m4')
+
+include(`centos_dev_extras.m4')

centos-stream9-pkcs11.docker.m4

@@ -0,0 +1,5 @@
+include(`centos-stream9-dev.docker.m4')
+
+include(`centos_pkcs11_extras.m4')
+
+ENV CLASSPATH=/usr/share/java/hamcrest/hamcrest.jar:/usr/share/java/junit.jar

centos-stream9.docker.m4

@@ -0,0 +1,17 @@
+FROM quay.io/centos/centos:stream9
+
+LABEL org.opencontainers.image.source="https://github.com/tpm2-software/tpm2-software-container"
+
+define(`CENTOS_JAVA', `java-17-openjdk java-17-openjdk-devel')dnl
+define(`CENTOS_LIBUSB_DEVEL', `libusb-devel')dnl
+define(`CENTOS_OPENSSL_PKCS11', `openssl-pkcs11')dnl
+include(`centos_base_deps.m4')
+include(`ibmtpm1682.m4')
+include(`swtpm.m4')
+
+# make install goes into /usr/local/lib/pkgconfig which is non-standard
+# Set this so ./configure can find things and we don't have to worry about prefix changes
+# to build instructions
+ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+
+WORKDIR /