update

.github/workflows/update-branches.yml

@@ -0,0 +1,94 @@
+name: Update Branches
+
+# we only want to run this job manually via button pushing
+on:
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: 'bash -Eeuo pipefail -x {0}'
+env:
+  TZ: UTC
+
+concurrency:
+  group: update-branches
+  cancel-in-progress: true
+
+jobs:
+
+  generate:
+    name: Generate Matrix
+    runs-on: ubuntu-latest
+    outputs:
+      arches: ${{ steps.generate.outputs.arches }}
+    steps:
+      - uses: actions/checkout@v2
+      - id: generate
+        name: Generate
+        run: |
+          arches="$(jq -Rsc 'rtrimstr("\n") | split("\n") | unique' */arches)"
+          echo "::set-output name=arches::$arches"
+
+  arch:
+    needs: generate
+    strategy:
+      matrix:
+        arch: ${{ fromJSON(needs.generate.outputs.arches) }}
+    name: Update ${{ matrix.arch }}
+    runs-on: ubuntu-latest
+    env:
+      dpkgArch: ${{ matrix.arch }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Prep
+        id: prep
+        run: |
+          case "$dpkgArch" in
+            amd64 | i386 | riscv64 | s390x) bashbrewArch="$dpkgArch" ;;
+            armhf) bashbrewArch='arm32v7' ;;
+            arm64) bashbrewArch='arm64v8' ;;
+            ppc64el) bashbrewArch='ppc64le' ;;
+            *) echo >&2 "error: unexpected / unsupported architecture: '$dpkgArch'"; exit 1 ;;
+          esac
+          echo "::set-output name=bashbrewArch::$bashbrewArch"
+          echo "bashbrewArch=$bashbrewArch" >> "$GITHUB_ENV"
+
+          git config user.name 'Docker Library Bot'
+          git config user.email 'github+dockerlibrarybot@infosiftr.com'
+
+      - name: Download Artifacts
+        run: |
+          echo "$dpkgArch" > arch
+          ./update.sh
+
+      - name: Commit
+        run: |
+          git add arch
+          for dir in */; do
+            dir="${dir%/}"
+            if [ ! -f "$dir/Dockerfile" ]; then
+              rm -rf "$dir"
+            fi
+            git add -A "$dir"
+          done
+
+          latestSerial="$(
+            gawk -F '=' '$1 == "SERIAL" { print $2 }' */build-info.txt \
+              | sort -un \
+              | tail -1
+          )"
+
+          latestDate="${latestSerial%%[^0-9]*}"
+          rfc2822="$(date --date "$latestDate" --rfc-2822)"
+          export GIT_AUTHOR_DATE="$rfc2822"
+          export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
+
+          git commit --message "Update to $latestSerial for $bashbrewArch ($dpkgArch)"
+
+      - name: Push
+        uses: ad-m/github-push-action@v0.6.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: dist-${{ steps.prep.outputs.bashbrewArch }}
+          force: true

CONTRIBUTING.md

@@ -7,13 +7,12 @@ for anything else other than updating the packages in an image though!
 
 The process for updating the images goes like this:
 
-1. Tarballs are published at https://partner-images.canonical.com/core/ by
+1. Tarballs are published at https://partner-images.canonical.com/oci/ by
    Canonical
 
-2. The button is clicked by someone with appropriate permissions to run
-   https://doi-janky.infosiftr.net/job/tianon/job/update-ubuntu/ (this job is
-   defined by
-   https://github.com/docker-library/oi-janky-groovy/blob/master/tianon/update-ubuntu-pipeline.groovy)
+2. Someone with appropriate permissions runs the
+   https://github.com/tianon/docker-brew-ubuntu-core/actions/workflows/update-branches.yml
+   workflow.
 
 3. This updates each `arch-*` branch of
    https://github.com/tianon/docker-brew-ubuntu-core/ to be one commit ahead of
@@ -31,7 +30,7 @@ The process for updating the images goes like this:
 6. The PR is reviewed, approved and submitted by the official image maintainers
    (https://github.com/docker-library/official-images/blob/master/MAINTAINERS)
 
-7. Some more Jenkins happens
+7. Some Jenkins happens
 
 8. The new images are published on https://hub.docker.com
 

arch

@@ -0,0 +1 @@
+amd64

bionic/Dockerfile

@@ -0,0 +1,3 @@
+FROM scratch
+ADD ubuntu-bionic-oci-amd64-root.tar.gz /
+CMD ["bash"]

bionic/SHA256SUMS

@@ -0,0 +1,12 @@
+a51df03c6ddced22d2ddd0d64716b7c71245e7856de45089dc79e001b1112cf6  ubuntu-bionic-oci-amd64-root.manifest
+c4ffedbf6e96d705fc5bfb7560e80f93b521556b967e143ecf4cd2ae5721a2f6  ubuntu-bionic-oci-amd64-root.tar.gz
+e859fc8ecb55234900cbce9f23f1bdbbd701922fd3806c3a6a1cc31654ea7f41  ubuntu-bionic-oci-arm64-root.manifest
+79f57019981204e535246220345a9db25b995204605c16ac094f7a0bf45c8307  ubuntu-bionic-oci-arm64-root.tar.gz
+33d5e07a74317b3ec78a1a19d0b56b5fca99322e05a38a9e03b43b445058325e  ubuntu-bionic-oci-armhf-root.manifest
+c4fcec13ef932dc9c652d8cf4798fdfe06c6c7c079d076315db478ec5cdc34d0  ubuntu-bionic-oci-armhf-root.tar.gz
+0c207a93a4233e794cc5b2afb8cb991c08c74cf5f36a48a44cb1502ea308d619  ubuntu-bionic-oci-i386-root.manifest
+237f8cf27272336268d74cbaa4c37e6192c20a41d018d2b0af7a0056c01702a1  ubuntu-bionic-oci-i386-root.tar.gz
+dea4994d498658f079cf45e31598e851291a2ebd16eaed928f22c31869f6e61b  ubuntu-bionic-oci-ppc64el-root.manifest
+036884778a82a8602f14c029807c7a67798610b4c734cbd1f45ee453bdb1d95b  ubuntu-bionic-oci-ppc64el-root.tar.gz
+903b91f64edffd99dc8820666a197fa5a26f1994ea89114b0ffa4a6832bd17f0  ubuntu-bionic-oci-s390x-root.manifest
+6a602df2377ed5758adb79c0d0370726d6f23f1e4a062702f9e3150d66ae30b5  ubuntu-bionic-oci-s390x-root.tar.gz

bionic/SHA256SUMS.gpg

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iQIcBAABAgAGBQJi6BPTAAoJEBpdbEx9uHyBBdMQAKPP5Orzc/hLRO9nCljS9bml
+WMbA+k9fghMDVDna9VCfM55gwVkGwMoLmqoQOCo+eTQX8+BFfdlMHOok95tEFYfl
+LF5iWCKgrtgk/f0RyhW/sS62JmcUoT1vaEVn9uQfCf5Qs92OfA9O1ZgL0B/P5PhL
+3nJ9ItemAhz9JJ2okXmRPs0woFk/qL8+tMFkfAoJtJEqzKEbQlfmuHsn2lux+cfQ
+mY9vYshgOCP7FyDEfSD9SycKIJlF15QyILk+GXVRhf2Hay9ULqfvgzz6JweqPyyW
+FeLFO2wJ9dZMcG/HOp8jPXQTI6CN+hJssFVSWbYQoeU2c9jd9B67uFBAjUyri47U
+40MypYQLLL5JAGskn2mLhreBCT/PShaadR0234vgQU87ASeWobOI02S7znCREbPQ
+GxaKEIXHYsEfcS2Pc2EI7JKbWEcOAzq8H5/TIHGGLUbzcmZoCxlfzkl3MrI/Cg37
+MEESiaVf1eS1i3AFgbYnENFyg/b+OmY0Bbl0W3qCaCTBqDzXck3f4uNN19ftIV9x
+i+SVvaDoVTcVlRsioJBhY/3DWILlntIqehkbPe9kFE5W9B+iZ4/RD8acllAhvC+2
+8piI3+Ua+eVMBF2amR4rsPdE7L2AEq65psj2IstxQTyvVv65CJtlpkgbWqCwVCJR
+l5sTSMTc0FJtNjLjWOQA
+=cATK
+-----END PGP SIGNATURE-----

bionic/build-info.txt

@@ -0,0 +1 @@
+SERIAL=20220801

bionic/ubuntu-bionic-oci-amd64-root.manifest

@@ -0,0 +1,89 @@
+adduser	3.116ubuntu1
+apt	1.6.14
+base-files	10.1ubuntu2.11
+base-passwd	3.5.44
+bash	4.4.18-2ubuntu1.3
+bsdutils	1:2.31.1-0.4ubuntu3.7
+bzip2	1.0.6-8.1ubuntu0.2
+coreutils	8.28-1ubuntu1
+dash	0.5.8-2.10
+debconf	1.5.66ubuntu1
+debianutils	4.8.4
+diffutils	1:3.6-1
+dpkg	1.19.0.5ubuntu2.4
+e2fsprogs	1.44.1-1ubuntu1.4
+fdisk	2.31.1-0.4ubuntu3.7
+findutils	4.6.0+git+20170828-2
+gcc-8-base:amd64	8.4.0-1ubuntu1~18.04
+gpgv	2.2.4-1ubuntu1.6
+grep	3.1-2build1
+gzip	1.6-5ubuntu1.2
+hostname	3.20
+init-system-helpers	1.51
+libacl1:amd64	2.2.52-3build1
+libapt-pkg5.0:amd64	1.6.14
+libattr1:amd64	1:2.4.47-2build1
+libaudit-common	1:2.8.2-1ubuntu1.1
+libaudit1:amd64	1:2.8.2-1ubuntu1.1
+libblkid1:amd64	2.31.1-0.4ubuntu3.7
+libbz2-1.0:amd64	1.0.6-8.1ubuntu0.2
+libc-bin	2.27-3ubuntu1.6
+libc6:amd64	2.27-3ubuntu1.6
+libcap-ng0:amd64	0.7.7-3.1
+libcom-err2:amd64	1.44.1-1ubuntu1.4
+libdb5.3:amd64	5.3.28-13.1ubuntu1.1
+libdebconfclient0:amd64	0.213ubuntu1
+libext2fs2:amd64	1.44.1-1ubuntu1.4
+libfdisk1:amd64	2.31.1-0.4ubuntu3.7
+libffi6:amd64	3.2.1-8
+libgcc1:amd64	1:8.4.0-1ubuntu1~18.04
+libgcrypt20:amd64	1.8.1-4ubuntu1.3
+libgmp10:amd64	2:6.1.2+dfsg-2
+libgnutls30:amd64	3.5.18-1ubuntu1.5
+libgpg-error0:amd64	1.27-6
+libhogweed4:amd64	3.4.1-0ubuntu0.18.04.1
+libidn2-0:amd64	2.0.4-1.1ubuntu0.2
+liblz4-1:amd64	0.0~r131-2ubuntu3.1
+liblzma5:amd64	5.2.2-1.3ubuntu0.1
+libmount1:amd64	2.31.1-0.4ubuntu3.7
+libncurses5:amd64	6.1-1ubuntu1.18.04
+libncursesw5:amd64	6.1-1ubuntu1.18.04
+libnettle6:amd64	3.4.1-0ubuntu0.18.04.1
+libp11-kit0:amd64	0.23.9-2ubuntu0.1
+libpam-modules:amd64	1.1.8-3.6ubuntu2.18.04.3
+libpam-modules-bin	1.1.8-3.6ubuntu2.18.04.3
+libpam-runtime	1.1.8-3.6ubuntu2.18.04.3
+libpam0g:amd64	1.1.8-3.6ubuntu2.18.04.3
+libpcre3:amd64	2:8.39-9ubuntu0.1
+libprocps6:amd64	2:3.3.12-3ubuntu1.2
+libseccomp2:amd64	2.5.1-1ubuntu1~18.04.2
+libselinux1:amd64	2.7-2build2
+libsemanage-common	2.7-2build2
+libsemanage1:amd64	2.7-2build2
+libsepol1:amd64	2.7-1ubuntu0.1
+libsmartcols1:amd64	2.31.1-0.4ubuntu3.7
+libss2:amd64	1.44.1-1ubuntu1.4
+libstdc++6:amd64	8.4.0-1ubuntu1~18.04
+libsystemd0:amd64	237-3ubuntu10.53
+libtasn1-6:amd64	4.13-2
+libtinfo5:amd64	6.1-1ubuntu1.18.04
+libudev1:amd64	237-3ubuntu10.53
+libunistring2:amd64	0.9.9-0ubuntu2
+libuuid1:amd64	2.31.1-0.4ubuntu3.7
+libzstd1:amd64	1.3.3+dfsg-2ubuntu1.2
+login	1:4.5-1ubuntu2.3
+lsb-base	9.20170808ubuntu1
+mawk	1.3.3-17ubuntu3
+mount	2.31.1-0.4ubuntu3.7
+ncurses-base	6.1-1ubuntu1.18.04
+ncurses-bin	6.1-1ubuntu1.18.04
+passwd	1:4.5-1ubuntu2.3
+perl-base	5.26.1-6ubuntu0.5
+procps	2:3.3.12-3ubuntu1.2
+sed	4.4-2
+sensible-utils	0.0.12
+sysvinit-utils	2.88dsf-59.10ubuntu1
+tar	1.29b-2ubuntu0.3
+ubuntu-keyring	2018.09.18.1~18.04.2
+util-linux	2.31.1-0.4ubuntu3.7
+zlib1g:amd64	1:1.2.11.dfsg-0ubuntu2.1

focal/Dockerfile

@@ -0,0 +1,3 @@
+FROM scratch
+ADD ubuntu-focal-oci-amd64-root.tar.gz /
+CMD ["bash"]

focal/SHA256SUMS

@@ -0,0 +1,12 @@
+40795f39d0f4d3187c0132c5c1d0cb73195caaa8097e0486d75f8edc8cd109b0  ubuntu-focal-oci-amd64-root.manifest
+908896fee17c7c3c7b35981d3e5030afa066f2a757a00df9521390308e15275c  ubuntu-focal-oci-amd64-root.tar.gz
+afde2e714e09e78ca4bbeb2700ac706cd7b174fab0b5525edc5fec0458c0bfab  ubuntu-focal-oci-arm64-root.manifest
+2099d1899e7e6b110a2bb269edb7e2322e4f75a266f6e562ae3c1c189e06394d  ubuntu-focal-oci-arm64-root.tar.gz
+45bfb3d20ad9797fd3442e4179ef4bc28a7681c77bd3c74b8e2484a8afd67e3b  ubuntu-focal-oci-armhf-root.manifest
+1cdd75754be4bbb65155133d91d0521cf206839ce5ad41fa0cef1b0df74ad9ac  ubuntu-focal-oci-armhf-root.tar.gz
+979c58ab736eaf720ae1244e396590a271ddac602208b28223de53c06efeca81  ubuntu-focal-oci-ppc64el-root.manifest
+d3f7688ce2d1bb682783f6b10d37ca0d77e1115384932f29d9bf8b98b973c4ef  ubuntu-focal-oci-ppc64el-root.tar.gz
+e5b5dfc3ffe3168e28b965a64f5c8643d619f612268dabd9cd17029f1feeab2d  ubuntu-focal-oci-riscv64-root.manifest
+126291630fbacebacfec221e0d3f12653f4857ad989257dc17fe78300dd5d7b0  ubuntu-focal-oci-riscv64-root.tar.gz
+d9a475e2eddc1bec1fc75a257095aeced3156f17c0d0a1c0a72309bfe70575ae  ubuntu-focal-oci-s390x-root.manifest
+c834e3f65025b7cb79e0f5749ba496fda8e5233ce5a37641ddc0ff7a832a62a9  ubuntu-focal-oci-s390x-root.tar.gz

focal/SHA256SUMS.gpg

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iQIcBAABAgAGBQJi6BfdAAoJEBpdbEx9uHyBpwkP/14cziODF6b4TZa5bS65hBst
+J9MTJmYgWGB28ySjPKS+K4q2SCLh2+y7aUNhSxg08TRZpHsr4U9tstCQ6UQQ11Ra
+2nEjLEx0K2hOduxzQn3oT8orX7DMmaHCb8hnkVouaAa/W3Gx3AJLDLNV87Idrtlk
+ZV6jUxZI9VJAQsoCfn/c+/hKAvXrNessMGDISEDulW/KqQjbncSut8Y1ls2F4LPv
+mLN2C8t9iqmwIAOh5Um2sI/Q9X0hYkUg0EKW8F4WuNmTtKqMYECDaUOs8iggkA2j
+iPev+pVSZC05ZCn7GkcB9lwvHm0UKqc/zwpr1R3yeJzyY580IN9PBuZUyETabfHt
+CYJDcAzm5q8aWe62pfESmLeobTBOGWoejAevj3Ppb5PrP9i74gLtsa8djiBzVgmy
+Mewyb+8xt0p4X1ZGxo25xhNkV7J1K7ilRuqo2kyIEk9Dmju/7nawbOy5dTYzrjBB
+XG/hptp9scy1tDQLxQcxA0adrZqPU/hdOjAKkkSEGA5gBQLgL8njN/wHvXjtbtg1
+xwiSBOPj2te37qUdfJ47wOW3Wq95nO2yYjMggQklTjsddVCKfPFM7xDTUxXb3Wqr
+LQFqUZ2TrGhTFvPgt3Pae1tL/j3oQIgQUH2FNFBP798TVBfoqmG2m5ve9j5C9yrR
+D/i+akBVID8ssdjcm7Pw
+=oA18
+-----END PGP SIGNATURE-----

focal/arches

@@ -2,4 +2,5 @@ amd64
 arm64
 armhf
 ppc64el
+riscv64
 s390x

focal/build-info.txt

@@ -0,0 +1 @@
+SERIAL=20220801

focal/ubuntu-focal-oci-amd64-root.manifest

@@ -0,0 +1,92 @@
+adduser	3.118ubuntu2
+apt	2.0.9
+base-files	11ubuntu5.5
+base-passwd	3.5.47
+bash	5.0-6ubuntu1.2
+bsdutils	1:2.34-0.1ubuntu9.3
+bzip2	1.0.8-2
+coreutils	8.30-3ubuntu2
+dash	0.5.10.2-6
+debconf	1.5.73
+debianutils	4.9.1
+diffutils	1:3.7-3
+dpkg	1.19.7ubuntu3.2
+e2fsprogs	1.45.5-2ubuntu1.1
+fdisk	2.34-0.1ubuntu9.3
+findutils	4.7.0-1ubuntu1
+gcc-10-base:amd64	10.3.0-1ubuntu1~20.04
+gpgv	2.2.19-3ubuntu2.2
+grep	3.4-1
+gzip	1.10-0ubuntu4.1
+hostname	3.23
+init-system-helpers	1.57
+libacl1:amd64	2.2.53-6
+libapt-pkg6.0:amd64	2.0.9
+libattr1:amd64	1:2.4.48-5
+libaudit-common	1:2.8.5-2ubuntu6
+libaudit1:amd64	1:2.8.5-2ubuntu6
+libblkid1:amd64	2.34-0.1ubuntu9.3
+libbz2-1.0:amd64	1.0.8-2
+libc-bin	2.31-0ubuntu9.9
+libc6:amd64	2.31-0ubuntu9.9
+libcap-ng0:amd64	0.7.9-2.1build1
+libcom-err2:amd64	1.45.5-2ubuntu1.1
+libcrypt1:amd64	1:4.4.10-10ubuntu4
+libdb5.3:amd64	5.3.28+dfsg1-0.6ubuntu2
+libdebconfclient0:amd64	0.251ubuntu1
+libext2fs2:amd64	1.45.5-2ubuntu1.1
+libfdisk1:amd64	2.34-0.1ubuntu9.3
+libffi7:amd64	3.3-4
+libgcc-s1:amd64	10.3.0-1ubuntu1~20.04
+libgcrypt20:amd64	1.8.5-5ubuntu1.1
+libgmp10:amd64	2:6.2.0+dfsg-4
+libgnutls30:amd64	3.6.13-2ubuntu1.6
+libgpg-error0:amd64	1.37-1
+libhogweed5:amd64	3.5.1+really3.5.1-2ubuntu0.2
+libidn2-0:amd64	2.2.0-2
+liblz4-1:amd64	1.9.2-2ubuntu0.20.04.1
+liblzma5:amd64	5.2.4-1ubuntu1.1
+libmount1:amd64	2.34-0.1ubuntu9.3
+libncurses6:amd64	6.2-0ubuntu2
+libncursesw6:amd64	6.2-0ubuntu2
+libnettle7:amd64	3.5.1+really3.5.1-2ubuntu0.2
+libp11-kit0:amd64	0.23.20-1ubuntu0.1
+libpam-modules:amd64	1.3.1-5ubuntu4.3
+libpam-modules-bin	1.3.1-5ubuntu4.3
+libpam-runtime	1.3.1-5ubuntu4.3
+libpam0g:amd64	1.3.1-5ubuntu4.3
+libpcre2-8-0:amd64	10.34-7
+libpcre3:amd64	2:8.39-12ubuntu0.1
+libprocps8:amd64	2:3.3.16-1ubuntu2.3
+libseccomp2:amd64	2.5.1-1ubuntu1~20.04.2
+libselinux1:amd64	3.0-1build2
+libsemanage-common	3.0-1build2
+libsemanage1:amd64	3.0-1build2
+libsepol1:amd64	3.0-1ubuntu0.1
+libsmartcols1:amd64	2.34-0.1ubuntu9.3
+libss2:amd64	1.45.5-2ubuntu1.1
+libstdc++6:amd64	10.3.0-1ubuntu1~20.04
+libsystemd0:amd64	245.4-4ubuntu3.17
+libtasn1-6:amd64	4.16.0-2
+libtinfo6:amd64	6.2-0ubuntu2
+libudev1:amd64	245.4-4ubuntu3.17
+libunistring2:amd64	0.9.10-2
+libuuid1:amd64	2.34-0.1ubuntu9.3
+libzstd1:amd64	1.4.4+dfsg-3ubuntu0.1
+login	1:4.8.1-1ubuntu5.20.04.2
+logsave	1.45.5-2ubuntu1.1
+lsb-base	11.1.0ubuntu2
+mawk	1.3.4.20200120-2
+mount	2.34-0.1ubuntu9.3
+ncurses-base	6.2-0ubuntu2
+ncurses-bin	6.2-0ubuntu2
+passwd	1:4.8.1-1ubuntu5.20.04.2
+perl-base	5.30.0-9ubuntu0.2
+procps	2:3.3.16-1ubuntu2.3
+sed	4.7-1
+sensible-utils	0.0.12+nmu1
+sysvinit-utils	2.96-2.1ubuntu1
+tar	1.30+dfsg-7ubuntu0.20.04.2
+ubuntu-keyring	2020.02.11.4
+util-linux	2.34-0.1ubuntu9.3
+zlib1g:amd64	1:1.2.11.dfsg-2ubuntu1.3

jammy/Dockerfile

@@ -0,0 +1,3 @@
+FROM scratch
+ADD ubuntu-jammy-oci-amd64-root.tar.gz /
+CMD ["bash"]