new docker images

Author: mxcl

.github/Dockerfile

@@ -19,10 +19,16 @@ permissions:
 
 jobs:
   build-and-push-image:
-    name: docker buildx pkgxdev/pkgx:${{ github.event.release.tag_name || github.event.inputs.tag }}
+    strategy:
+      matrix:
+        variety:
+          - archlinux
+          - busybox
+          - debian
+          - ubuntu
     runs-on: ubuntu-latest
     steps:
-      - uses: robinraju/release-downloader@v1.11
+      - uses: robinraju/release-downloader@v1.12
         with:
           releaseId: ${{ github.event.release.id }}
           tag: ${{ github.event.inputs.tag }}
@@ -31,6 +37,10 @@ jobs:
       - name: is_latest?
         id: latest
         run: |
+          if [ ${{ matrix.variety }} != debian ]; then
+            echo "value=false" >> "${GITHUB_OUTPUT}"
+            exit
+          fi
           TAG_NAME="${{ github.event.release.tag_name || github.event.inputs.tag }}"
           LATEST_RELEASE=$(gh api repos/${{ github.repository }}/releases/latest --jq '.tag_name')
           if [ "$TAG_NAME" == "$LATEST_RELEASE" ]; then
@@ -74,10 +84,11 @@ jobs:
           flavor: |
             latest=${{ steps.latest.outputs.value }}
           tags: |
-            type=sha
-            type=semver,pattern=v{{version}},value=${{ github.event.release.tag_name || github.event.inputs.tag }}
-            type=semver,pattern=v{{major}}.{{minor}},value=${{ github.event.release.tag_name || github.event.inputs.tag }}
-            type=semver,pattern=v{{major}},value=${{ github.event.release.tag_name || github.event.inputs.tag }}
+            type=semver,pattern=v{{version}},value=${{ github.event.release.tag_name || github.event.inputs.tag }},enable=${{ matrix.variety == 'debian' }}
+            type=semver,pattern=v{{major}}.{{minor}},value=${{ github.event.release.tag_name || github.event.inputs.tag }},enable=${{ matrix.variety == 'debian' }}
+            type=semver,pattern=v{{major}},value=${{ github.event.release.tag_name || github.event.inputs.tag }},enable=${{ matrix.variety == 'debian' }}
+            type=raw,value=${{ matrix.variety }}
+        if: ${{ matrix.variety == 'debian' }}
 
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
@@ -90,6 +101,7 @@ jobs:
           docker buildx build \
             --push \
             $tags \
+            --tag pkgxdev/pkgx:${{matrix.variety}} \
             --platform linux/amd64,linux/arm64 \
-            --file ./src/.github/Dockerfile \
+            --file ./src/docker/Dockerfile.${{ matrix.variety }} \
             .

.github/workflows/cd.docker.yml

@@ -3,7 +3,7 @@ name: ci·docker
 on:
   pull_request:
     paths:
-      - .github/Dockerfile
+      - docker/Dockerfile.*
       - .github/workflows/ci.docker.yml
 
 concurrency:
@@ -15,51 +15,45 @@ permissions:
   packages: write
 
 jobs:
-  docker-build:
+  go:
     runs-on: ubuntu-latest
-    container: debian:buster-slim
+    strategy:
+      matrix:
+        variety:
+          - archlinux
+          - busybox
+          - debian
+          - ubuntu
     steps:
       - uses: actions/checkout@v4
 
-      - run: apt-get update && apt-get install -y curl gcc perl make
-
-      - uses: dtolnay/rust-toolchain@stable
-      - run: cargo build --release
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: products
-          path: ./target/release/pkgx
-
-  docker-test:
-    runs-on: ubuntu-latest
-    needs: docker-build
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/download-artifact@v4
+      - uses: robinraju/release-downloader@v1.12
         with:
-          name: products
+          fileName: pkgx-*+linux+x86-64.tar.gz
+          latest: true
 
       - run: |
           mkdir products
-          mv ./pkgx products/$(uname -m)
+          tar xzf pkgx*.tar.gz
+          mv pkgx products/$(uname -m)
           curl https://pkgxdev.github.io/pkgm/pkgm.ts -o products/pkgm
 
       - run:
           docker build
-          --tag pkgxdev/pkgx
-          --file .github/Dockerfile
+          --tag pkgxdev/${{ matrix.variety }}
+          --file docker/Dockerfile.${{ matrix.variety }}
           .
 
       - run: |
           cat <<EoD> Dockerfile
-          FROM pkgxdev/pkgx
+          FROM pkgxdev/${{ matrix.variety }}
           RUN pkgx --version
           RUN if git --version; then exit 1; fi
           RUN pkgx git --version
+          RUN pkgm --version
           RUN pkgm install git
           RUN if ! git --version; then exit 2; fi
+          RUN pkgx node --eval "console.log(1)"
           EoD
 
           docker build --file Dockerfile .

.github/workflows/ci.docker.yml

@@ -0,0 +1,10 @@
+FROM archlinux AS stage0
+COPY ./products/* /pkgx/
+RUN install -m 755 /pkgx/$(uname -m) /usr/local/bin/pkgx
+RUN install -m 755 /pkgx/pkgm /usr/local/bin/pkgm
+
+FROM archlinux AS stage1
+COPY --from=stage0 /usr/local/bin/pkgx /usr/local/bin/pkgm /usr/local/bin/
+
+CMD ["/bin/bash"]
+ENTRYPOINT ["/usr/local/bin/pkgx"]

docker/Dockerfile.archlinux

@@ -0,0 +1,19 @@
+FROM debian:buster-slim AS stage0
+COPY ./products/* /pkgx/
+RUN install -m 755 /pkgx/$(uname -m) /usr/local/bin/pkgx
+RUN install -m 755 /pkgx/pkgm /usr/local/bin/pkgm
+
+# FIXME a newer glibc would be nice, but the libpthread.so we copy in then fails
+FROM busybox:1.31-glibc AS stage1
+COPY --from=stage0 /usr/local/bin/pkgx /usr/local/bin/pkgm /usr/local/bin/
+
+# pkgx packages also need libgcc
+COPY --from=stage0 /lib/x86_64-linux-gnu/libgcc_s.so.1 /lib/libgcc_s.so.1
+# these are part of glibc but for some reason this image doesn’t have them
+COPY --from=stage0 /lib/x86_64-linux-gnu/librt-2.28.so /lib/librt.so.1
+COPY --from=stage0 /lib/x86_64-linux-gnu/libdl-2.28.so /lib/libdl.so.2
+# we need env for `pkgm`
+COPY --from=stage0 /usr/bin/env /usr/bin/env
+
+CMD ["/bin/bash"]
+ENTRYPOINT ["/usr/local/bin/pkgx"]

docker/Dockerfile.busybox

@@ -0,0 +1,10 @@
+FROM debian:stable-slim AS stage0
+COPY ./products/* /pkgx/
+RUN install -m 755 /pkgx/$(uname -m) /usr/local/bin/pkgx
+RUN install -m 755 /pkgx/pkgm /usr/local/bin/pkgm
+
+FROM debian:stable-slim AS stage1
+COPY --from=stage0 /usr/local/bin/pkgx /usr/local/bin/pkgm /usr/local/bin/
+
+CMD ["/bin/bash"]
+ENTRYPOINT ["/usr/local/bin/pkgx"]

docker/Dockerfile.debian

@@ -0,0 +1,10 @@
+FROM ubuntu AS stage0
+COPY ./products/* /pkgx/
+RUN install -m 755 /pkgx/$(uname -m) /usr/local/bin/pkgx
+RUN install -m 755 /pkgx/pkgm /usr/local/bin/pkgm
+
+FROM ubuntu AS stage1
+COPY --from=stage0 /usr/local/bin/pkgx /usr/local/bin/pkgm /usr/local/bin/
+
+CMD ["/bin/bash"]
+ENTRYPOINT ["/usr/local/bin/pkgx"]