Merge pull request #6 from ufal/issue/#5

update docker defaults and ci
ufal · Jun 21, 2024 · 22dacc0 · 22dacc0
2 parents 284f0db + 3f66914
commit 22dacc0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/docker/cli.yml b/docker/cli.yml
@@ -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}

diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
@@ -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:
@@ -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:
@@ -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

diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
@@ -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:
@@ -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:
@@ -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

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -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: