D11, D12 and U22 should be working…

Debian builds need a devscripts and equivs as pre-depencies.
perfsonar · Aug 24, 2023 · aef2642 · aef2642
1 parent d7d3a5e
commit aef2642
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/docker-envs/Dockerfile-d12 b/docker-envs/Dockerfile-d12
@@ -1,11 +1,9 @@
-# TODO: Change this to "debian:12" once that becomes available on
-# DockerHub.
-FROM debian:bookworm AS unibuild-image
+FROM debian:12 AS unibuild-image
 
 # Install pre-requisites for building packages
 RUN apt-get update -y && \
     apt-get upgrade -y && \
-    apt-get install -y sudo apt-utils curl devscripts emacs-nox gnupg htop m4 pylint rsync screen tree vim
+    apt-get install -y sudo apt-utils curl emacs-nox gnupg htop m4 pylint rsync screen tree vim
 
 # Copy unibuild source
 COPY . /usr/share/unibuild/

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" "u18" "u20" "u22")
+declare -a OSimages=("d10" "d11" "d12" "u18" "u20" "u22")
 
 while getopts "chr:v" OPT; do
     case $OPT in

diff --git a/docker-envs/docker-compose.yml b/docker-envs/docker-compose.yml
@@ -65,6 +65,22 @@ services:
     platform: "linux/ppc64le"
     image: ghcr.io/perfsonar/unibuild/d11:latest@sha256:1192ecbcf7b81acded3e3ca9c225accaf189fc2cf6fced3e3ed97f3446626ba4
     volumes: *default-volumes
+  d12_amd64:
+    platform: "linux/amd64"
+    image: ghcr.io/perfsonar/unibuild/d12:latest@sha256:9d78943784008fe297705104b6db31d6f4a438a82e5cc6320de81910a9865881
+    volumes: *default-volumes
+  d12_arm64:
+    platform: "linux/arm64"
+    image: ghcr.io/perfsonar/unibuild/d12:latest@sha256:0fc546c75ed6b8c06265b07a1764de403a0e08599d43c58904ee94633b6f42e6
+    volumes: *default-volumes
+  d12_armv7:
+    platform: "linux/arm/v7"
+    image: ghcr.io/perfsonar/unibuild/d12:latest@sha256:762c87418f8ac73c3fd524d0fd710c60e1efd8991795400b737457278fc7ca95
+    volumes: *default-volumes
+  d12_ppc64le:
+    platform: "linux/ppc64le"
+    image: ghcr.io/perfsonar/unibuild/d12:latest@sha256:1192ecbcf7b81acded3e3ca9c225accaf189fc2cf6fced3e3ed97f3446626ba4
+    volumes: *default-volumes
   u18_amd64:
     platform: "linux/amd64"
     image: ghcr.io/perfsonar/unibuild/u18:latest@sha256:6711fd1696e04fd9613012c359adf7158ef49e54645c88c13ba45ffc4aeced51

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', 'u18:latest', 'u20:latest', 'u22:latest');
+my @OSimages = ('d10:latest', 'd11:latest', 'd12:latest', 'u18:latest', 'u20:latest', 'u22:latest');
 my $file, $newsha, $count=0;
 
 # Announce what we'll do

diff --git a/unibuild-package/Makefile b/unibuild-package/Makefile
@@ -44,7 +44,7 @@ ifndef STAGE2
 ifeq ($(PACKAGE_FORMAT),rpm)
 	$(RUN_AS_ROOT) $(INSTALL_PACKAGE) -y install make rpmdevtools
 else
-	$(RUN_AS_ROOT) apt-get -y install make dpkg-dev
+	$(RUN_AS_ROOT) apt-get -y install make dpkg-dev devscripts equivs
 endif
 	$(MAKE) STAGE2=1 $@