Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Base: Update to Debian 12.5 #82

Merged
merged 5 commits into from
Jun 2, 2024
Merged

Base: Update to Debian 12.5 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d9d9c06
Update to Debian 12.5
mbargull Jun 1, 2024
ef950c2
Replace deprecated "conda info --all"
mbargull Jun 1, 2024
ceab730
Show podman/buildah versions
mbargull Jun 2, 2024
5f88144
Use newer CI build image
mbargull Jun 2, 2024
dfb738f
Try newer podman/buildah via travier/podman-action
mbargull Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 30 additions & 6 deletions .github/workflows/base-glibc-busybox-bash.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,47 @@ on:
jobs:
build:
name: Build & Push
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
container:
# travier/podman-action contains newer podman/buildah versions.
image: quay.io/travier/podman-action
options: --privileged
Comment on lines +19 to +21
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

refs:

Copy link
Member Author

@mbargull mbargull Jun 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should fix bioconda/bioconda-utils#958 since this uses buildah >=1.35.0 which includes containers/storage#1847 .
On the Docker side, the issue should also be resolved for older images when docker >=25.0.4 onward is used.

env:
# The base image is not intended to change often and should be used with
# version tags or checksum IDs, but not via "latest".
MAJOR_VERSION: 3
MINOR_VERSION: 0
MINOR_VERSION: 1
IMAGE_NAME: base-glibc-busybox-bash
BUSYBOX_VERSION: '1.36.1'
DEBIAN_VERSION: '12.2'
DEBIAN_VERSION: '12.5'

steps:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
with:
platforms: arm64
run: |
podman run --rm --privileged \
docker.io/tonistiigi/binfmt --install arm64
Comment on lines +36 to +37
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is essentially the same as what docker/setup-qemu-action does (it even uses the same container image, IIRC).


- name: Install Tools
run: |
set -eu
# jq is not installed in travier/podman-action
dnf install -qy \
jq
rpm -q \
buildah podman \
coreutils findutils sed \
curl jq \
| (
while read -r line ; do
printf %s\\n "${line}"
case "${line}" in (*' not installed'*)
err=1 ;;
esac
done
exit "${err-0}"
)

- name: Build
id: build
Expand Down
36 changes: 30 additions & 6 deletions .github/workflows/base-glibc-debian-bash.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,46 @@ on:
jobs:
build:
name: Build & Push
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
container:
# travier/podman-action contains newer podman/buildah versions.
image: quay.io/travier/podman-action
options: --privileged
env:
# The base image is not intended to change often and should be used with
# version tags or checksum IDs, but not via "latest".
MAJOR_VERSION: 3
MINOR_VERSION: 0
MINOR_VERSION: 1
IMAGE_NAME: base-glibc-debian-bash
DEBIAN_VERSION: '12.2'
DEBIAN_VERSION: '12.5'

steps:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
with:
platforms: arm64
run: |
podman run --rm --privileged \
docker.io/tonistiigi/binfmt --install arm64

- name: Install Tools
run: |
set -eu
# jq is not installed in travier/podman-action
dnf install -qy \
jq
rpm -q \
buildah podman \
coreutils findutils sed \
curl jq \
| (
while read -r line ; do
printf %s\\n "${line}"
case "${line}" in (*' not installed'*)
err=1 ;;
esac
done
exit "${err-0}"
)

- name: Build
id: build
Expand Down
2 changes: 1 addition & 1 deletion images/base-glibc-busybox-bash/Dockerfile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ RUN arch=$(uname -m) \
&& \
sh ./Miniforge3-Linux-${arch}.sh -bp /opt/conda \
&& \
/opt/conda/bin/conda info --all
/opt/conda/bin/conda info --verbose
2 changes: 1 addition & 1 deletion images/base-glibc-debian-bash/Dockerfile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ RUN apt-get update -qq \
&& \
sh ./Miniforge3-Linux-${arch}.sh -bp /opt/conda \
&& \
/opt/conda/bin/conda info --all
/opt/conda/bin/conda info --verbose