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.

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

Force docker buildx to use the default builder #75

Merged
merged 1 commit into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ jobs:
- name: "Build and push Docker images"
run: |
cd docker

# Use the default builder because buildx cannot currently build on a base image
# that it has just built. See https://github.com/docker/buildx/issues/1453
# We still need buildx for its --build-context feature.
docker buildx use default

make GITHUB_ACTIONS=${GITHUB_ACTIONS} GITHUB_REPOSITORY_OWNER=${{ github.repository_owner }}

docker image prune --force
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/nightly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ jobs:
run: |
TAG=$(git describe --always --tags)

# Use the default builder because buildx cannot currently build on a base image
# that it has just built. See https://github.com/docker/buildx/issues/1453
# We still need buildx for its --build-context feature.
docker buildx use default

cd docker
make GITHUB_ACTIONS=${GITHUB_ACTIONS} GITHUB_REPOSITORY_OWNER=${{ github.repository_owner }} ${{ env.SERVER_IMAGE }}.${TAG}
make GITHUB_ACTIONS=${GITHUB_ACTIONS} GITHUB_REPOSITORY_OWNER=${{ github.repository_owner }} ${{ env.CLIENT_IMAGE }}.${TAG}
Expand Down
3 changes: 3 additions & 0 deletions docker/irods_clients/ubuntu/16.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
ARG BASE_IMAGE=ubuntu:16.04
FROM $BASE_IMAGE as installer

# This default is the latest usable version
ARG IRODS_VERSION="4.2.7"

# These defaults are the latest usable versions
ARG BATON_VERSION="4.2.0"
ARG HTSLIB_VERSION="1.18"
ARG SAMTOOLS_VERSION="1.18"
Expand Down
2 changes: 2 additions & 0 deletions docker/irods_clients/ubuntu/22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ ARG BASE_IMAGE=ubuntu:22.04
FROM $BASE_IMAGE as installer

ARG IRODS_VERSION="4.3-nightly"

# These defaults are the latest usable versions
ARG BATON_VERSION="4.2.0"
ARG HTSLIB_VERSION="1.18"
ARG SAMTOOLS_VERSION="1.18"
Expand Down
4 changes: 3 additions & 1 deletion docker/irods_clients/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
ARG BASE_IMAGE=ubuntu:18.04
FROM $BASE_IMAGE as installer

# Other iRODS versions available on bionic are 4.3.0
# This default is the latest usable version
ARG IRODS_VERSION="4.2.11"

# These defaults are the latest usable versions
ARG BATON_VERSION="4.2.0"
ARG HTSLIB_VERSION="1.18"
ARG SAMTOOLS_VERSION="1.18"
Expand Down
1 change: 1 addition & 0 deletions docker/irods_clients_dev/ubuntu/16.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ARG BASE_IMAGE=ubuntu:16.04
FROM $BASE_IMAGE

# This default is the latest usable version
ARG IRODS_VERSION="4.2.7"

COPY . /opt/docker/irods_clients_dev
Expand Down
4 changes: 2 additions & 2 deletions docker/irods_clients_dev/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG BASE_IMAGE=ubuntu:18.04
FROM $BASE_IMAGE

# Other versions available on bionic are 4.3.0
ARG IRODS_VERSION="4.2.11"
# This default is is latest usable version
ARG IRODS_VERSION="4.2.12"

COPY . /opt/docker/irods_clients_dev

Expand Down