Skip to content

Commit 40c0d16

Browse files
committed
Update Docker to no longer reference removed/replaced backend "pgcrypto" images.
1 parent 38b641e commit 40c0d16

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

docker/db.entities.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# # Therefore, it should be kept in sync with that file
1515
services:
1616
dspacedb:
17-
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
17+
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-loadsql:${DSPACE_VER:-latest}"
1818
environment:
1919
# This LOADSQL should be kept in sync with the URL in DSpace/DSpace
2020
# This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data

docker/docker-compose-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ services:
6060
# NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
6161
dspacedb:
6262
container_name: dspacedb
63-
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
63+
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-loadsql:${DSPACE_VER:-latest}"
6464
environment:
6565
# This LOADSQL should be kept in sync with the LOADSQL in
6666
# https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml

docker/docker-compose-rest.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,12 @@ services:
6767
# DSpace database container
6868
dspacedb:
6969
container_name: dspacedb
70-
# Uses a custom Postgres image with pgcrypto installed
71-
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}"
70+
# Uses the base PostgreSQL image
71+
image: "docker.io/postgres:${POSTGRES_VERSION:-15}"
7272
environment:
7373
PGDATA: /pgdata
74+
POSTGRES_DB: dspace
75+
POSTGRES_USER: dspace
7476
POSTGRES_PASSWORD: dspace
7577
networks:
7678
- dspacenet

0 commit comments

Comments
 (0)