Skip to content

Commit 718348f

Browse files
Tim Zhoutzhou5
authored andcommitted
Create new automation image 10-30-25
Signed-off-by: Tim Zhou <[email protected]> Specify WiX Toolset version on Windows The WiX version should be consistent with the one that is specified to build the Podman installer. Moreover the WiX toolset licensing has changed with the release of version 6 and we should not upgrade to it unless Podman organization becomes a sponsor of the project: containers/podman#27042 Signed-off-by: Mario Loriedo <[email protected]> skopeo_cidev: add docker-distribution Signed-off-by: Lokesh Mandvekar <[email protected]> Install packages for protoc-gen-go and protoc-gen-go-grpc Install the packages that provide the protoc protobuf compiler with the ability to generate Go and Go GRPC support. Signed-off-by: Nalin Dahyabhai <[email protected]>
1 parent 28dd0c3 commit 718348f

File tree

6 files changed

+10
-4
lines changed

6 files changed

+10
-4
lines changed

IMG_SFX

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20250910t092246z-f42f41d13
1+
20251030t184431z-f42f41d13

cache_images/debian_packaging.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ INSTALL_PACKAGES=(\
8686
podman
8787
protobuf-c-compiler
8888
protobuf-compiler
89+
protoc-gen-go
90+
protoc-gen-go-grpc
8991
python-is-python3
9092
python3-dateutil
9193
python3-dateutil

cache_images/debian_setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if ! ((CONTAINER)); then
6060
# https://github.com/containers/podman/pull/27030#issuecomment-3271357228
6161
# Current 6.16.3 kernel here has a bad memory leak that causes a lot of failure sin podman CI.
6262
# Work around by using the stock kernel from this image for now.
63-
timebomb 20251001 "Remove kernel bug workaround"
63+
timebomb 20251101 "Remove kernel bug workaround"
6464
ooe.sh $SUDO sed -i 's|GRUB_DEFAULT=0|GRUB_DEFAULT="Advanced options for Debian GNU/Linux>Debian GNU/Linux, with Linux 6.1.0-37-cloud-amd64"|' /etc/default/grub
6565
ooe.sh $SUDO update-grub
6666
fi

cache_images/fedora_packaging.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ INSTALL_PACKAGES=(\
7575
gnupg
7676
go-md2man
7777
golang
78+
golang-google-grpc
79+
golang-google-protobuf
7880
gpgme
7981
gpgme-devel
8082
grubby

skopeo_cidev/packages.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# general deps
2+
docker-distribution
23
git
34
golang
45
golang-github-cpuguy83-md2man

win_images/win_packaging.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ Invoke-WebRequest -Uri https://dotnet.microsoft.com/download/dotnet/scripts/v1/d
2222
# Configure NuGet sources for dotnet to fetch wix (and other packages) from
2323
& 'C:\Program Files\dotnet\dotnet.exe' nuget add source https://api.nuget.org/v3/index.json -n nuget.org
2424

25-
# Install wix
26-
& 'C:\Program Files\dotnet\dotnet.exe' tool install --global wix
25+
# Install wix. Version should match the one in
26+
# https://github.com/containers/podman/blob/main/contrib/win-installer/podman.wixproj
27+
& 'C:\Program Files\dotnet\dotnet.exe' tool install --global wix --version 5.0.2
2728

2829
# Install Hyper-V
2930
Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All -NoRestart

0 commit comments

Comments
 (0)