Make base images multiarch #55
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,19 +14,24 @@ on: | |
| jobs: | ||
| build: | ||
| name: Build & Push | ||
| runs-on: ubuntu-22.04 | ||
| env: | ||
| # The base image is not intended to change often and should be used with | ||
| # version tags or checksum IDs, but not via "latest". | ||
| IMAGE_VERSION: '3.0.0' | ||
| IMAGE_NAME: base-glibc-debian-bash | ||
| DEBIAN_VERSION: '10.9' | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - name: Set up QEMU | ||
| uses: docker/setup-qemu-action@v2 | ||
| with: | ||
| platforms: arm64 | ||
|
|
||
| - name: Calculate tags and labels | ||
| id: calculate | ||
| run: | | ||
| set -xeu | ||
| cd 'images/${{ env.IMAGE_NAME }}' | ||
|
|
@@ -44,10 +49,10 @@ jobs: | |
| debian="$( run cat /etc/debian_version | sed '1!d' )" | ||
| bash="$( run bash --version | sed '1!d' )" | ||
| buildah rm "${container}" | ||
| labels=" | ||
|
There was a problem hiding this comment. buildah config --label=glibc="${glibc}" "${container}" Not sure what did the original buildah do? Just label variable? Was it used by some other where? There was a problem hiding this comment. I don't know where and how these labels are used but they are still set at https://github.com/bioconda/bioconda-containers/pull/55/files#diff-b4a54ac6775437f0dbe546b99c784d76f3defaaa74b1456488e4fa4f78850e1cR75 |
||
| glibc=${glibc} | ||
| debian=${debian} | ||
| " | ||
|
|
||
| glibc_version="$( printf %s "${glibc}" | sed -E 's/.*version ([0-9.]*[0-9]).*/\1/' )" | ||
| debian_version="$( printf %s "${debian}" | sed -E 's|/|_|g' )" | ||
|
|
@@ -57,24 +62,28 @@ jobs: | |
| ${{ env.IMAGE_VERSION }}_${glibc_version}_${debian_version}_${bash_version} | ||
| latest | ||
| " | ||
|
|
||
| echo "tags=$( echo ${tags} )" >> $GITHUB_OUTPUT | ||
| echo "labels=$( echo ${labels} )" >> $GITHUB_OUTPUT | ||
|
|
||
| - name: Build multiarch image | ||
| id: build | ||
| uses: redhat-actions/buildah-build@v2 | ||
| with: | ||
| image: ${{ env.IMAGE_NAME }} | ||
| tags: ${{ steps.calculate.outputs.tags }} | ||
| labels: ${{ steps.calculate.outputs.labels }} | ||
| archs: amd64,arm64 | ||
| build-args: | | ||
| debian_version=${{ env.DEBIAN_VERSION }} | ||
| containerfiles: | | ||
| ./images/${{ env.IMAGE_NAME }}/Dockerfile | ||
|
|
||
| - name: Test | ||
| run: | | ||
| image='${{ steps.build.outputs.image }}' | ||
| ids="$( | ||
| for tag in ${{ steps.calculate.outputs.tags }} ; do | ||
| buildah images --quiet --no-trunc "${image}:${tag}" | ||
| done | ||
| )" | ||
|
|
@@ -90,13 +99,13 @@ jobs: | |
|
|
||
| - name: Check Tags | ||
| run: | | ||
| set -x | ||
| # FIX upstream: Quay.io does not support immutable images currently. | ||
| # => Try to use the REST API to check for duplicate tags. | ||
| response="$( | ||
| curl -sL -H "Authorization: Bearer ${{ secrets.QUAY_BIOCONDA_TOKEN }}" \ | ||
|
There was a problem hiding this comment. This is not tested because the secrets are not exported to forks/PRs. |
||
| 'https://quay.io/api/v1/repository/bioconda/${{ steps.build.outputs.image }}/image' | ||
| )" | ||
|
|
||
| existing_tags="$( | ||
| printf %s "${response}" \ | ||
|
|
@@ -107,10 +116,10 @@ jobs: | |
| 'Could not get list of image tags.' \ | ||
| 'Does the repository exist on Quay.io?' \ | ||
| 'Quay.io REST API response was:' \ | ||
| "${response}" | ||
| exit 1 | ||
| } | ||
| for tag in ${{ steps.calculate.outputs.tags }} ; do | ||
| if [ \! "${tag}" = latest ] ; then | ||
| if printf %s "${existing_tags}" | grep -qxF "${tag}" ; then | ||
| printf 'Tag %s already exists!\n' "${tag}" | ||
|
|
@@ -122,21 +131,22 @@ jobs: | |
| TOKEN: ${{ secrets.secrets.QUAY_BIOCONDA_TOKEN }} | ||
|
|
||
| - if: ${{ github.ref == 'refs/heads/main' }} | ||
| name: Push To quay.io | ||
| id: push-to-quay | ||
| uses: redhat-actions/push-to-registry@v2 | ||
| with: | ||
| image: ${{ steps.build.outputs.image }} | ||
| tags: ${{ steps.calculate.outputs.tags }} | ||
| registry: ${{ secrets.QUAY_BIOCONDA_REPO }} | ||
| username: ${{ secrets.QUAY_BIOCONDA_USERNAME }} | ||
| password: ${{ secrets.QUAY_BIOCONDA_TOKEN }} | ||
|
|
||
| - if: ${{ github.ref == 'refs/heads/main' }} | ||
| name: Test Pushed | ||
| run: | | ||
| image='${{ steps.build.outputs.image }}' | ||
| ids="$( | ||
| for tag in ${{ steps.calculate.outputs.tags }} ; do | ||
| buildah images --quiet --no-trunc "${image}:${tag}" | ||
| done | ||
| )" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it a normal upgrade or for special fixing?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I bumped the major version because now the image would be multi-arch and because of the update of Ubuntu version and the GLIBC coming with it.
But since there are no changes for the x86_64 users maybe we should bump the minor/patch version ?! I am OK to update the PR with the preferred change by the maintainers!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The only reason I can think of to keep the older version is to use an older libc for testing to make sure our packages for on older HPC. But this should be ensure with the build container ... so following this and trusting the build container I think we could bump the runtime container.
@bioconda/build-system any thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just bumped the version of
create-envimage too to3.0.0, so it is in sync with the other images in this PR.As I said above I'd be happy to change the version to whatever the Bioconda team thinks it should be!