Updating SHA256 image URL, refs #45

Removing U18 and D10 remains.
perfsonar · Oct 16, 2024 · b9e5fbc · b9e5fbc
1 parent 9476d9b
commit b9e5fbc
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 55 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ 'ol8', 'el9', 'd11', 'd12', 'u18', 'u20', 'u22', 'u24' ]
+        os: [ 'ol8', 'el9', 'd11', 'd12', 'u20', 'u22', 'u24' ]
 
     runs-on: ubuntu-latest
     permissions:

diff --git a/README.md b/README.md
@@ -390,9 +390,11 @@ Containers containing a minimal OS installation and Unibuild pre-installed are a
 | Red Hat | CentOS | 7 | `ghcr.io/perfsonar/unibuild/el7:latest` |
 | Red Hat | Alma Linux | 8 | `ghcr.io/perfsonar/unibuild/el8:latest` |
 | Red Hat | Alma Linux | 9 | `ghcr.io/perfsonar/unibuild/el9:latest` |
-| Debian | Debian | 10 | `ghcr.io/perfsonar/unibuild/d10:latest` |
-| Debian | Ubuntu | 18 | `ghcr.io/perfsonar/unibuild/u18:latest` |
+| Debian | Debian | 11 | `ghcr.io/perfsonar/unibuild/d11:latest` |
+| Debian | Debian | 12 | `ghcr.io/perfsonar/unibuild/d12:latest` |
 | Debian | Ubuntu | 20 | `ghcr.io/perfsonar/unibuild/u20:latest` |
+| Debian | Ubuntu | 22 | `ghcr.io/perfsonar/unibuild/u22:latest` |
+| Debian | Ubuntu | 24 | `ghcr.io/perfsonar/unibuild/u24:latest` |
 
 Debian family containers are provided for different CPU architectures.
 

diff --git a/docker-envs/build-dev-images b/docker-envs/build-dev-images
@@ -35,7 +35,7 @@ clear_cache=false
 verbose=false
 build_type=
 registry=
-declare -a OSimages=("d10" "d11" "d12" "u18" "u20" "u22" "u24")
+declare -a OSimages=("d11" "d12" "u20" "u22" "u24")
 
 while getopts "chr:v" OPT; do
     case $OPT in

diff --git a/docker-envs/docker-bake.hcl b/docker-envs/docker-bake.hcl
@@ -7,7 +7,7 @@
 // https://github.com/zclconf/go-cty/tree/main/cty/function/stdlib
 
 variable "OSimage" {
-    default = "u18"
+    default = "u20"
 }
 variable "registry" {
     default = ""

diff --git a/docker-envs/docker-compose.yml b/docker-envs/docker-compose.yml
@@ -33,100 +33,83 @@ services:
       context: ../
       dockerfile: ./docker-envs/Dockerfile-el9
     volumes: *default-volumes
-  d10_amd64:
-    platform: "linux/amd64"
-    image: ghcr.io/perfsonar/unibuild/d10:latest@sha256:9b66916478a122e2863929c7d10a60c39ffee1c03125c3b7d7913fabf3b51223
-    volumes: *default-volumes
-  d10_arm64:
-    platform: "linux/arm64"
-    image: ghcr.io/perfsonar/unibuild/d10:latest@sha256:6276c5fe65b9f67a0b039d02a696f91cb2b2bbb9333e991ead6ba6076e04683d
-    volumes: *default-volumes
-  d10_armv7:
-    platform: "linux/arm/v7"
-    image: ghcr.io/perfsonar/unibuild/d10:latest@sha256:2999751397b4b992b3f764e3e9d901ed1bca4ebaecc751994d15995b9d7c460c
-    volumes: *default-volumes
-  d10_ppc64le:
-    platform: "linux/ppc64le"
-    image: ghcr.io/perfsonar/unibuild/d10:latest@sha256:8a96de2a03d9f051ef65a225b9fad61db486b73afc325deff5baf5200ce018c4
-    volumes: *default-volumes
   d11_amd64:
     platform: "linux/amd64"
-    image: ghcr.io/perfsonar/unibuild/d11:latest@sha256:16b987529e5daef8ef6543a1cd914f1002d548b71104a8b56536ba27ab9e1757
+    image: ghcr.io/perfsonar/unibuild/d11:latest@sha256:b9269f914fadbde9f2fc915d077c668fa92f372c19563cbfb3c486a5e1405bbc
     volumes: *default-volumes
   d11_arm64:
     platform: "linux/arm64"
-    image: ghcr.io/perfsonar/unibuild/d11:latest@sha256:f60aa23f9e214e8a9bfbac7086860413f784bdced8731b4b9c0eafea180d1c4a
+    image: ghcr.io/perfsonar/unibuild/d11:latest@sha256:dff28ee104b9649128c2c03059df8db6b53ea46b741f449434497b02c661596a
     volumes: *default-volumes
   d11_armv7:
     platform: "linux/arm/v7"
-    image: ghcr.io/perfsonar/unibuild/d11:latest@sha256:8434acd009e3176850907f9703b52f17081addb26d993829f385dfed5ff01b84
+    image: ghcr.io/perfsonar/unibuild/d11:latest@sha256:b195b233b3ce97f49a9a261ef4c1084439a69d38e2b38b982f81d1bfb0f8e6cb
     volumes: *default-volumes
   d11_ppc64le:
     platform: "linux/ppc64le"
-    image: ghcr.io/perfsonar/unibuild/d11:latest@sha256:fd1735b964ba9ed506eb62030dc8a1773b88557a6701b7384177974da45cad8c
+    image: ghcr.io/perfsonar/unibuild/d11:latest@sha256:95ff473a1d3faaa3e4cc29869f44e5cedc87463f4b5953aa40b09a095309cfcf
     volumes: *default-volumes
   d12_amd64:
     platform: "linux/amd64"
-    image: ghcr.io/perfsonar/unibuild/d12:latest@sha256:fac7af8973b268fcdcebde13bc9fe61c842b14a36a44961488261b4896a295a8
+    image: ghcr.io/perfsonar/unibuild/d12:latest@sha256:3d4d305254cb30f825359d3f95eb517a81be95c88e2864c98ae857fc8da6ea12
     volumes: *default-volumes
   d12_arm64:
     platform: "linux/arm64"
-    image: ghcr.io/perfsonar/unibuild/d12:latest@sha256:97612a80da014b96a3b526835e7b0df88f292cffc766ea72969904baadb50366
+    image: ghcr.io/perfsonar/unibuild/d12:latest@sha256:64f3e174878cc86ab07899a3b01551409604a4d410b78d2b4a662f691faf8503
     volumes: *default-volumes
   d12_armv7:
     platform: "linux/arm/v7"
-    image: ghcr.io/perfsonar/unibuild/d12:latest@sha256:2045bd4208bf9a7000527f5c908ca1bd2574a9acd7439d85203dbeb103b39e50
+    image: ghcr.io/perfsonar/unibuild/d12:latest@sha256:61bf66a9fc0a61b15ff7d4928f1386cee3acab1bd7ba98c0fb6491b57b0d69a4
     volumes: *default-volumes
   d12_ppc64le:
     platform: "linux/ppc64le"
-    image: ghcr.io/perfsonar/unibuild/d12:latest@sha256:7b214880448151aa6800a7b71406eb0f10175df005c1de939039c65ee2fb3424
-    volumes: *default-volumes
-  u18_amd64:
-    platform: "linux/amd64"
-    image: ghcr.io/perfsonar/unibuild/u18:latest@sha256:d8b3c9fec7de41cc5fd25871c440ef1e6bc37ffecb03b21c58c04666ee76184c
-    volumes: *default-volumes
-  u18_arm64:
-    platform: "linux/arm64"
-    image: ghcr.io/perfsonar/unibuild/u18:latest@sha256:68bbc7ae2309627ca4b27662a8cc90ee930158c5af6bceefea0e7420ca8d27b6
-    volumes: *default-volumes
-  u18_armv7:
-    platform: "linux/arm/v7"
-    image: ghcr.io/perfsonar/unibuild/u18:latest@sha256:df2d92ac10cb24f1fd6a33e865e6c0d1a33b1e15da41bc726a8ad831ba89d9ae
-    volumes: *default-volumes
-  u18_ppc64le:
-    platform: "linux/ppc64le"
-    image: ghcr.io/perfsonar/unibuild/u18:latest@sha256:6ba57c8002600af068d3f70af060323d02a04575f00c020d1c43cdb63e7c1cff
+    image: ghcr.io/perfsonar/unibuild/d12:latest@sha256:6aced6ec74467279f1d4fa6c6edb5b94fe81e240f1cc7fb9befd52e3a1ee2b03
     volumes: *default-volumes
   u20_amd64:
     platform: "linux/amd64"
-    image: ghcr.io/perfsonar/unibuild/u20:latest@sha256:6940527bd0f3cf004d37998bc1be88710c8eb9ce45ced319cbdef8103b93ceb3
+    image: ghcr.io/perfsonar/unibuild/u20:latest@sha256:ef92eada79085b091ad39f17d09d5508ec43cd6593157fbf49155e3f42db6528
     volumes: *default-volumes
   u20_arm64:
     platform: "linux/arm64"
-    image: ghcr.io/perfsonar/unibuild/u20:latest@sha256:1cd12943614537ae41c9a0be931875bb771c31865a26963a44c2fbd054e1cfa8
+    image: ghcr.io/perfsonar/unibuild/u20:latest@sha256:fb7ae46f697b2201d613077f017435f075fb2309e833cb20c65a862131899283
     volumes: *default-volumes
   u20_armv7:
     platform: "linux/arm/v7"
-    image: ghcr.io/perfsonar/unibuild/u20:latest@sha256:ecdda2536876566b990d499ab94f3bf9d84380b029bc87dbbfd77df73208f103
+    image: ghcr.io/perfsonar/unibuild/u20:latest@sha256:3e907906f7288005ad07f68267aab3f3561e4ff28409f77cc23d1a9708e255ef
     volumes: *default-volumes
   u20_ppc64le:
     platform: "linux/ppc64le"
-    image: ghcr.io/perfsonar/unibuild/u20:latest@sha256:f32fb00333e05dabdf4c0abd0b8a7aebafa3269e03dbc3638c783a54e12b5137
+    image: ghcr.io/perfsonar/unibuild/u20:latest@sha256:af2eb8af3fb93dc1e91e979d9074eb013cd81d7841d682ad6a4c06255e5e1f11
     volumes: *default-volumes
   u22_amd64:
     platform: "linux/amd64"
-    image: ghcr.io/perfsonar/unibuild/u22:latest@sha256:ba65ed593494e86524471c9c033a2ed40ff4ebb686efb0fabf67053d69eff58f
+    image: ghcr.io/perfsonar/unibuild/u22:latest@sha256:8b6498dc22de69f18f9c12cb352143c9dd47fe9eb9b2f87ff735d8c1bc88b606
     volumes: *default-volumes
   u22_arm64:
     platform: "linux/arm64"
-    image: ghcr.io/perfsonar/unibuild/u22:latest@sha256:5ccf31920f1d9381c7c8f9db87bb618e29f8efa7e49315b5ed6a1f9045b0f6ad
+    image: ghcr.io/perfsonar/unibuild/u22:latest@sha256:8e0ea73269ed7748246caae5b6ec2bf04599070164935c5566497cb5a0ba3cb4
     volumes: *default-volumes
   u22_armv7:
     platform: "linux/arm/v7"
-    image: ghcr.io/perfsonar/unibuild/u22:latest@sha256:78c238da4931a8b81e1765f70dba040f9cfa46baa56b9f618f32068cc416779a
+    image: ghcr.io/perfsonar/unibuild/u22:latest@sha256:8f9588990f714a59409b29b17ee750bb40149c91d950714cfe3207deaad26d30
     volumes: *default-volumes
   u22_ppc64le:
     platform: "linux/ppc64le"
-    image: ghcr.io/perfsonar/unibuild/u22:latest@sha256:91d5ba272ca73f62d18758d2a2cbad7e85ca9f5830680d44da90447006999046
+    image: ghcr.io/perfsonar/unibuild/u22:latest@sha256:97cc15d3a1e20c6ab95b23eeeebe69d0f1d601d915094f2e2e907dea613b1a58
+    volumes: *default-volumes
+  u24_amd64:
+    platform: "linux/amd64"
+    image: ghcr.io/perfsonar/unibuild/u24:latest@sha256:576d17d92d1838797ec13c423257c13e79521cf2d00ee6cc036b6ca8472460ce
+    volumes: *default-volumes
+  u24_arm64:
+    platform: "linux/arm64"
+    image: ghcr.io/perfsonar/unibuild/u24:latest@sha256:002b744fbee0c3fdf646364e7e7f05e86b96969ee8b4d8841b571a528596b351
+    volumes: *default-volumes
+  u24_armv7:
+    platform: "linux/arm/v7"
+    image: ghcr.io/perfsonar/unibuild/u24:latest@sha256:9e558737afaf4a5f4790ec8138a90dbb30da283803cb86289d30edd98048391c
+    volumes: *default-volumes
+  u24_ppc64le:
+    platform: "linux/ppc64le"
+    image: ghcr.io/perfsonar/unibuild/u24:latest@sha256:2f8112e325db41c139ed5dbae75f4c80ec06bf2a3ebd22a292e10dddb8fc6be9
     volumes: *default-volumes
-  # TODO: Add u24_*
diff --git a/docker-envs/update-sha256-images b/docker-envs/update-sha256-images
@@ -9,7 +9,7 @@
 my $filename = 'docker-compose.yml';
 my $registry_path = 'ghcr.io/perfsonar/unibuild/';
 my $registry_path_esc = $registry_path =~ s/\//\\\//gr;
-my @OSimages = ('d10:latest', 'd11:latest', 'd12:latest', 'u18:latest', 'u20:latest', 'u22:latest', "u24:latest');
+my @OSimages = ('d11:latest', 'd12:latest', 'u20:latest', 'u22:latest', 'u24:latest');
 my $file, $newsha, $count=0;
 
 # Announce what we'll do