Skip to content

Commit

Permalink
Use docker.io prefix for images on Docker hub
Browse files Browse the repository at this point in the history
Docker assumes docker.io by default, but there are other container
runtimes (for example Podman) where this should be explicit. It is
better to use fully-qualified image names to support other runtime
environments in the future.
  • Loading branch information
alanorth committed Dec 11, 2022
1 parent 4915f10 commit eab286b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This image will be published as dspace/dspace-angular
# See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details

FROM node:18-alpine
FROM docker.io/node:18-alpine
WORKDIR /app
ADD . /app/
EXPOSE 4000
Expand Down
2 changes: 1 addition & 1 deletion docker/cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ version: "3.7"

services:
dspace-cli:
image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
image: "docker.io/${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
container_name: dspace-cli
environment:
# Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
Expand Down
2 changes: 1 addition & 1 deletion docker/db.entities.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ version: "3.7"

services:
dspacedb:
image: dspace/dspace-postgres-pgcrypto:loadsql
image: docker.io/dspace/dspace-postgres-pgcrypto:loadsql
environment:
# This LOADSQL should be kept in sync with the URL in DSpace/DSpace
# This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
Expand Down
6 changes: 3 additions & 3 deletions docker/docker-compose-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
solr__P__server: http://dspacesolr:8983/solr
depends_on:
- dspacedb
image: dspace/dspace:dspace-7_x-test
image: docker.io/dspace/dspace:dspace-7_x-test
networks:
dspacenet:
ports:
Expand Down Expand Up @@ -65,7 +65,7 @@ services:
# This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
LOADSQL: https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
PGDATA: /pgdata
image: dspace/dspace-postgres-pgcrypto:loadsql
image: docker.io/dspace/dspace-postgres-pgcrypto:loadsql
networks:
dspacenet:
stdin_open: true
Expand All @@ -76,7 +76,7 @@ services:
dspacesolr:
container_name: dspacesolr
# Uses official Solr image at https://hub.docker.com/_/solr/
image: solr:8.11-slim
image: docker.io/solr:8.11-slim
# Needs main 'dspace' container to start first to guarantee access to solr_configs
depends_on:
- dspace
Expand Down
6 changes: 3 additions & 3 deletions docker/docker-compose-rest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
# proxies.trusted.ipranges: This setting is required for a REST API running in Docker to trust requests
# from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
proxies__P__trusted__P__ipranges: '172.23.0'
image: dspace/dspace:dspace-7_x-test
image: docker.io/dspace/dspace:dspace-7_x-test
depends_on:
- dspacedb
networks:
Expand Down Expand Up @@ -69,7 +69,7 @@ services:
container_name: dspacedb
environment:
PGDATA: /pgdata
image: dspace/dspace-postgres-pgcrypto
image: docker.io/dspace/dspace-postgres-pgcrypto
networks:
dspacenet:
ports:
Expand All @@ -83,7 +83,7 @@ services:
dspacesolr:
container_name: dspacesolr
# Uses official Solr image at https://hub.docker.com/_/solr/
image: solr:8.11-slim
image: docker.io/solr:8.11-slim
# Needs main 'dspace' container to start first to guarantee access to solr_configs
depends_on:
- dspace
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
DSPACE_REST_HOST: localhost
DSPACE_REST_PORT: 8080
DSPACE_REST_NAMESPACE: /server
image: dspace/dspace-angular:dspace-7_x
image: docker.io/dspace/dspace-angular:dspace-7_x
build:
context: ..
dockerfile: Dockerfile
Expand Down

0 comments on commit eab286b

Please sign in to comment.