Skip to content

Commit f947d65

Browse files
authored
Update entrypoint for Ubuntu 24.04 (#286)
This commit removes the legacy Bullseye repositories and uses the default ones because the newer versions of goreleaser-cross use Ubuntu 24.04. It also fixes an error in the current images, which do not include the Windows ARM64 compiler.
1 parent 7d29d99 commit f947d65

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
contents: write
162162
uses: smallstep/workflows/.github/workflows/docker-buildx-push.yml@main
163163
with:
164-
platforms: linux/amd64,linux/arm64,linux/386,linux/arm
164+
platforms: linux/amd64,linux/386,linux/arm,linux/arm64
165165
tags: ${{ needs.create_release.outputs.docker_tags }}
166166
docker_image: smallstep/step-kms-plugin
167167
docker_file: docker/Dockerfile
@@ -189,7 +189,7 @@ jobs:
189189
contents: write
190190
uses: smallstep/workflows/.github/workflows/docker-buildx-push.yml@main
191191
with:
192-
platforms: linux/amd64,linux/arm64,linux/386,linux/arm
192+
platforms: linux/amd64,linux/386,linux/arm,linux/arm64
193193
tags: ${{ needs.create_release.outputs.docker_tags_cloud }}
194194
docker_image: smallstep/step-kms-plugin
195195
docker_file: docker/Dockerfile.cloud

docker/build/entrypoint.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@
22

33
set -e
44

5-
# Fix for missing bullseye repos:
6-
echo 'deb http://archive.debian.org/debian bullseye main
7-
deb http://deb.debian.org/debian-security bullseye-security main
8-
deb http://archive.debian.org/debian bullseye-updates main' > /etc/apt/sources.list
9-
105
apt update
116
apt install --no-install-recommends -y curl pkg-config libpcsclite-dev libpcsclite-dev:arm64
127

138
# Install syft
149
curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin
1510

11+
# Install llvm-mingw compiler for arm64 if necessary
12+
if [ ! -e /llvm-mingw ]; then
13+
cd /
14+
curl -sSfL "https://github.com/mstorsjo/llvm-mingw/releases/download/20251021/llvm-mingw-20251021-ucrt-ubuntu-22.04-x86_64.tar.xz" | bsdtar -xf -
15+
ln -snf $(pwd)/llvm-mingw-20251021-ucrt-ubuntu-22.04-x86_64 /llvm-mingw
16+
cd -
17+
fi
18+
1619
exec /entrypoint.sh $@

0 commit comments

Comments
 (0)