Skip to content

Commit 8387e0d

Browse files
author
benjamin
committed
feat: multi arch manifests for build image, remove duplicated leftover dockerfile from bioconda-containers
1 parent c793464 commit 8387e0d

5 files changed

Lines changed: 35 additions & 192 deletions

File tree

.github/workflows/build-env-image.yml

Lines changed: 0 additions & 117 deletions
This file was deleted.

.github/workflows/build-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
image: bioconda-utils-build-env-cos7-aarch64
2222
base_image: quay.io/condaforge/linux-anvil-aarch64
2323
- arch: amd64
24-
image: bioconda-utils-build-env-cos7
24+
image: bioconda-utils-build-env-cos7-x86_64
2525
base_image: quay.io/condaforge/linux-anvil-cos7-x86_64
2626
steps:
2727
- uses: actions/checkout@v4

.github/workflows/release-please.yml

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
id: buildah-build
4444
uses: redhat-actions/buildah-build@v2
4545
with:
46-
image: bioconda-utils-build-env-cos7
46+
image: bioconda-utils-build-env-cos7-x86_64
4747
arch: amd64
4848
build-args: |
4949
BASE_IMAGE=quay.io/condaforge/linux-anvil-cos7-x86_64
@@ -84,3 +84,36 @@ jobs:
8484
registry: ${{ secrets.QUAY_BIOCONDA_REPO }}
8585
username: ${{ secrets.QUAY_BIOCONDA_USERNAME }}
8686
password: ${{ secrets.QUAY_BIOCONDA_TOKEN }}
87+
88+
- name: Push multi-arch manifest to Quay
89+
env:
90+
QUAY_BIOCONDA_REPO: ${{ secrets.QUAY_BIOCONDA_REPO }}
91+
QUAY_BIOCONDA_USERNAME: ${{ secrets.QUAY_BIOCONDA_USERNAME }}
92+
QUAY_BIOCONDA_TOKEN: ${{ secrets.QUAY_BIOCONDA_TOKEN }}
93+
run: |
94+
set -euo pipefail
95+
96+
registry="${QUAY_BIOCONDA_REPO%%/*}"
97+
printf %s "${QUAY_BIOCONDA_TOKEN}" \
98+
| docker login "${registry}" \
99+
--username "${QUAY_BIOCONDA_USERNAME}" \
100+
--password-stdin
101+
102+
for tag in latest '${{ steps.get-tag.outputs.tag }}' ; do
103+
docker manifest create \
104+
"${QUAY_BIOCONDA_REPO}/bioconda-utils-build-env-cos7:${tag}" \
105+
"${QUAY_BIOCONDA_REPO}/bioconda-utils-build-env-cos7-x86_64:${tag}" \
106+
"${QUAY_BIOCONDA_REPO}/bioconda-utils-build-env-cos7-aarch64:${tag}"
107+
docker manifest annotate \
108+
"${QUAY_BIOCONDA_REPO}/bioconda-utils-build-env-cos7:${tag}" \
109+
"${QUAY_BIOCONDA_REPO}/bioconda-utils-build-env-cos7-x86_64:${tag}" \
110+
--arch amd64
111+
docker manifest annotate \
112+
"${QUAY_BIOCONDA_REPO}/bioconda-utils-build-env-cos7:${tag}" \
113+
"${QUAY_BIOCONDA_REPO}/bioconda-utils-build-env-cos7-aarch64:${tag}" \
114+
--arch arm64
115+
docker manifest push --purge \
116+
"${QUAY_BIOCONDA_REPO}/bioconda-utils-build-env-cos7:${tag}"
117+
docker manifest inspect \
118+
"${QUAY_BIOCONDA_REPO}/bioconda-utils-build-env-cos7:${tag}"
119+
done

.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,3 @@ docs/source/developer/_autosummary
1515

1616
# Mac OS Files
1717
.DS_Store
18-
19-
20-
# files created when building images
21-
images/build-env/bioconda-utils
22-
images/build-env/C.utf8

images/build-env/Dockerfile

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)