Update docker files for 8_x

2025-10-07 01:54:15 +00:00 · 2024-11-21 14:03:50 -05:00
parent 12804f800b
commit fbef294fb4
8 changed files with 17 additions and 15 deletions
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -2,7 +2,7 @@
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details

 # Test build:
-# docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
+# docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-8_x-dist .

 FROM node:18-alpine AS build

--- a/docker/README.md
+++ b/docker/README.md
@@ -23,14 +23,14 @@ the Docker compose scripts in this 'docker' folder.
 This Dockerfile is used to build a *development* DSpace Angular UI image, published as 'dspace/dspace-angular'

 ```
-docker build -t dspace/dspace-angular:latest .
+docker build -t dspace/dspace-angular:dspace-8_x .
 ```

 This image is built *automatically* after each commit is made to the `main` branch.

 Admins to our DockerHub repo can manually publish with the following command.
 ```
-docker push dspace/dspace-angular:latest
+docker push dspace/dspace-angular:dspace-8_x
 ```

 ### Dockerfile.dist
@@ -39,7 +39,7 @@ The `Dockerfile.dist` is used to generate a *production* build and runtime envir

 ```bash
 # build the latest image
-docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
+docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-8_x-dist .
 ```

 A default/demo version of this image is built *automatically*.
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -14,14 +14,14 @@
 # Therefore, it should be kept in sync with that file
 networks:
  # Default to using network named 'dspacenet' from docker-compose-rest.yml.
-  # Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")
+  # Its full name will be prepended with the project name (e.g. "-p d8" means it will be named "d8_dspacenet")
  # If COMPOSITE_PROJECT_NAME is missing, default value will be "docker" (name of folder this file is in)
  default:
    name: ${COMPOSE_PROJECT_NAME:-docker}_dspacenet
    external: true
 services:
  dspace-cli:
-    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
+    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-8_x}"
    container_name: dspace-cli
    environment:
      # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
--- a/docker/db.entities.yml
+++ b/docker/db.entities.yml
@@ -14,10 +14,11 @@
 # # Therefore, it should be kept in sync with that file
 services:
  dspacedb:
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}-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
+      # NOTE: currently there is no dspace8 version
      - LOADSQL=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
  dspace:
    ### OVERRIDE default 'entrypoint' in 'docker-compose-rest.yml' ####
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -33,7 +33,7 @@ services:
      # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
      solr__D__statistics__P__autoCommit: 'false'
      LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
+    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-8_x-test}"
    depends_on:
    - dspacedb
    networks:
@@ -60,11 +60,12 @@ services:
  # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
  dspacedb:
    container_name: dspacedb
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}-loadsql"
    environment:
      # 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
+      # NOTE: currently there is no dspace8 version
      LOADSQL: https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
      PGDATA: /pgdata
      POSTGRES_PASSWORD: dspace
@@ -81,7 +82,7 @@ services:
  # DSpace Solr container
  dspacesolr:
    container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
+    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-8_x}"
    networks:
      - dspacenet
    ports:
--- a/docker/docker-compose-dist.yml
+++ b/docker/docker-compose-dist.yml
@@ -26,7 +26,7 @@ services:
      DSPACE_REST_HOST: sandbox.dspace.org
      DSPACE_REST_PORT: 443
      DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:${DSPACE_VER:-latest}-dist
+    image: dspace/dspace-angular:${DSPACE_VER:-dspace-8_x}-dist
    build:
      context: ..
      dockerfile: Dockerfile.dist
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -40,7 +40,7 @@ services:
      # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
      proxies__P__trusted__P__ipranges: '172.23.0'
      LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
+    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-8_x-test}"
    depends_on:
    - dspacedb
    networks:
@@ -68,7 +68,7 @@ services:
  dspacedb:
    container_name: dspacedb
    # Uses a custom Postgres image with pgcrypto installed
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}"
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}"
    environment:
      PGDATA: /pgdata
      POSTGRES_PASSWORD: dspace
@@ -85,7 +85,7 @@ services:
  # DSpace Solr container  
  dspacesolr:
    container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
+    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-8_x}"
    networks:
      - dspacenet
    ports:
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -23,7 +23,7 @@ services:
      DSPACE_REST_HOST: localhost
      DSPACE_REST_PORT: 8080
      DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:${DSPACE_VER:-latest}
+    image: dspace/dspace-angular:${DSPACE_VER:-dspace-8_x}
    build:
      context: ..
      dockerfile: Dockerfile