Skip to content

update docker defaults and ci #6

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.

Sign up for GitHub

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

Merged
kosarko merged 1 commit into from
Jun 21, 2024
Merged

update docker defaults and ci #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion docker/cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version: "3.7"

services:
dspace-cli:
image: "${DOCKER_OWNER:-dataquest}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
image: "${DOCKER_OWNER:-ufal}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
container_name: dspace-cli
environment:
TZ: ${TIMEZONE:-Europe/Bratislava}
Expand Down
6 changes: 3 additions & 3 deletions docker/docker-compose-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
solr__D__statistics__P__autoCommit: 'false'
depends_on:
- dspacedb
image: ${DSPACE_CI_IMAGE:-dataquest/dspace:dspace-7_x-test}
image: ${DSPACE_CI_IMAGE:-ufal/dspace:dspace-7_x-test}
networks:
dspacenet:
ports:
Expand Down Expand Up @@ -67,7 +67,7 @@ services:
# This LOADSQL should be kept in sync with the LOADSQL in
# https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
# This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
LOADSQL: https://github.com/dataquest-dev/DSpace/releases/download/data/dspace-test-database-dump_29.1.2024.sql
LOADSQL: https://github.com/ufal/clarin-dspace/releases/download/data/dspace-test-database-dump_29.1.2024.sql
PGDATA: /pgdata
image: ${DSPACE_DB_IMAGE:-dspace/dspace-postgres-pgcrypto:loadsql}
networks:
Expand All @@ -79,7 +79,7 @@ services:
# DSpace Solr container
dspacesolr:
container_name: dspacesolr
image: ${DSPACE_SOLR_IMAGE:-dataquest/dspace-solr:dspace-7_x}
image: ${DSPACE_SOLR_IMAGE:-ufal/dspace-solr:dspace-7_x}
# 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ services:
assetstore__P__s3__P__awsRegionName: ${S3_REGION_NAME:-}
assetstore__P__s3__P__pathStyleAccessEnabled: ${S3_PATH_STYLE_ACCESS:-false}
assetstore__P__s3__P__endpoint: ${S3_ENDPOINT:-}
image: ${DSPACE_REST_IMAGE:-dataquest/dspace:dtq-dev-7.5}
image: ${DSPACE_REST_IMAGE:-ufal/dspace:dspace-7_x}
depends_on:
- dspacedb
networks:
Expand Down Expand Up @@ -94,7 +94,7 @@ services:
TZ: ${TIMEZONE:-Europe/Bratislava}
PGDATA: /pgdata
POSTGRES_PASSWORD: dspace
image: ${DSPACE_DB_IMAGE:-dataquest/dspace-postgres-pgcrypto:dspace-7_x}
image: ${DSPACE_DB_IMAGE:-ufal/dspace-postgres-pgcrypto:dspace-7_x}
networks:
dspacenet:
ports:
Expand All @@ -112,7 +112,7 @@ services:
TZ: ${TIMEZONE:-Europe/Bratislava}
restart: unless-stopped
container_name: dspacesolr${INSTANCE}
image: ${DSPACE_SOLR_IMAGE:-dataquest/dspace-solr:dspace-7_x}
image: ${DSPACE_SOLR_IMAGE:-ufal/dspace-solr:dspace-7_x}
# 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:
DSPACE_REST_HOST: ${DSPACE_HOST:-localhost}
DSPACE_REST_PORT: ${DSPACE_REST_PORT}
DSPACE_REST_NAMESPACE: /server
image: ${DSPACE_UI_IMAGE:-dataquest/dspace-angular:dspace-7_x}
image: ${DSPACE_UI_IMAGE:-ufal/dspace-angular:dspace-7_x}
volumes:
- ./config.prod.yml:/app/config/config.prod.yml
build:
Expand Down