Skip to content

Commit 0cbcf9a

Browse files
committed
Use Alpine 3.22 for build environment
as Ansible commit #82770 breaks fd inheritance for alpine-make-rootfs when run under ansible.builtin.shell
1 parent 64a12f4 commit 0cbcf9a

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/pinewall-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ jobs:
2727
--entrypoint /bin/sh \
2828
--workdir /mnt \
2929
--mount type=tmpfs,tmpfs-size=512M,destination=/tmp \
30-
docker.io/library/alpine:latest -c "apk --no-cache add ansible && ansible-playbook build.yml"
30+
docker.io/library/alpine:3.22 -c "apk --no-cache add ansible && ansible-playbook build.yml"

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ pinewall-build:
77
--entrypoint /bin/sh
88
--workdir /mnt
99
--mount="type=tmpfs,tmpfs-size=512M,destination=/tmp"
10-
docker.io/library/alpine:latest -c 'apk --no-cache add ansible && ansible-playbook build.yml'
10+
docker.io/library/alpine:3.22 -c 'apk --no-cache add ansible && ansible-playbook build.yml'

build_steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666

6767
- name: Fetch alpine-make-rootfs
6868
ansible.builtin.get_url:
69-
url: https://raw.githubusercontent.com/alpinelinux/alpine-make-rootfs/refs/tags/v0.7.2/alpine-make-rootfs
69+
url: https://raw.githubusercontent.com/alpinelinux/alpine-make-rootfs/refs/tags/v0.8.1/alpine-make-rootfs
7070
dest: '{{ playbook_dir }}/alpine-make-rootfs'
71-
checksum: 'sha256:9641ccda385b307dbf28123e68969351f297f3d339aa30d530df7c7ad7df9a03'
71+
checksum: 'sha256:b4cd8202fa04eae8b4abae22708638cf00ab5826d8b919bc86932fc0cb269f00'
7272
mode: '0750'
7373

7474
# Fetch our patched version of sloci-image that doesn't use relative paths

justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ build:
2121
--entrypoint /bin/sh \
2222
--workdir /mnt \
2323
--mount="type=tmpfs,tmpfs-size=512M,destination=/tmp" \
24-
docker.io/library/alpine:latest \
24+
docker.io/library/alpine:3.22 \
2525
-c 'apk --no-cache add ansible && \
2626
ansible-playbook build.yml'
2727

0 commit comments

Comments
 (0)