Skip to content

Commit 04cf0ea

Browse files
authored
Merge pull request DSpace#5016 from tdonohue/fix_docker_deploy_errors
[Docker] Fix bug in `docker-deploy` test by always pulling backend image from docker.io
2 parents 388c7eb + 36bf6a6 commit 04cf0ea

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.github/workflows/docker.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ jobs:
7474
DSPACE_REST_HOST: 127.0.0.1
7575
# Override default dspace.ui.url to also use 127.0.0.1.
7676
dspace__P__ui__P__url: http://127.0.0.1:4000
77-
# Docker Registry to use for Docker compose scripts below.
78-
# If this is a PR, then we need to use docker.io (as the registry must be public),
79-
# Otherwise we default to ghcr.io to avoid aggressive rate limits at DockerHub.
80-
DOCKER_REGISTRY: ${{ github.event_name == 'pull_request' && 'docker.io' || 'ghcr.io' }}
8177
steps:
8278
# Checkout our codebase (to get access to Docker Compose scripts)
8379
- name: Checkout codebase
@@ -98,6 +94,11 @@ jobs:
9894
docker image ls -a
9995
# Start backend using our compose script in the codebase.
10096
- name: Start backend in Docker
97+
# MUST use docker.io as we don't have a copy of this backend image in our GitHub Action,
98+
# and docker.io is the only public image. If we ever hit aggressive rate limits at DockerHub,
99+
# we may need to consider making the 'ghcr.io' images public & switch this to 'ghcr.io'
100+
env:
101+
DOCKER_REGISTRY: docker.io
101102
run: |
102103
docker compose -f docker/docker-compose-rest.yml up -d
103104
sleep 10

0 commit comments

Comments
 (0)