Some devops updates

Author: milanmajchrak

Dockerfile

@@ -24,7 +24,7 @@ ENV NODE_OPTIONS="--max_old_space_size=4096"
 # Listen / accept connections from all IP addresses.
 # NOTE: At this time it is only possible to run Docker container in Production mode
 # if you have a public URL. See https://github.com/DSpace/dspace-angular/issues/1485
-ENV NODE_ENV=development
+ENV NODE_ENV=production
 RUN apk add tzdata
 RUN yarn build:prod
 RUN npm install pm2 -g

build-scripts/run/cleanup-db-duplicates.sh

@@ -21,18 +21,4 @@ WHERE ctid NOT IN (
 
 -- Verify cleanup
 SELECT COUNT(*) as total_records FROM EPersonGroup2EPerson;
-SELECT COUNT(*) as unique_pairs FROM (
-    SELECT DISTINCT eperson_group_id, eperson_id
-    FROM EPersonGroup2EPerson
-) t;
-"
-
-echo "Executing duplicate cleanup..."
-docker exec $DDBNAME /bin/bash -c "psql -p 10563 -U dspace -d dspace -c \"$CLEANUP_SQL\""
-
-if [ $? -eq 0 ]; then
-    echo "Database cleanup completed successfully"
-else
-    echo "Database cleanup failed"
-    exit 1
-fi
+SELECT COUNT(DISTINCT eperson_group_id, eperson_id) as unique_pairs FROM EPersonGroup2EPerson;

build-scripts/run/start.sh

@@ -27,9 +27,17 @@ echo "====="
 #docker compose --env-file $ENVFILE -p $PROJECT -f docker/matomo-w-db.yml pull
 #docker compose --env-file $ENVFILE -p $PROJECT -f docker/matomo-w-db.yml up -d --no-build
 
+# Ensure CLI container uses the same project network
+export COMPOSE_PROJECT_NAME=$PROJECT
+
 # docker-compose-rest.yml must be last, since it specifies network in more detail. If it is not last, there is "root must be a mapping" error.
+echo "Creating administrator user..."
 docker compose --env-file $ENVFILE -p $PROJECT -f docker/docker-compose.yml -f docker/cli.yml -f docker/docker-compose-rest.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en -o dataquest
+
+echo "Creating regular user..."
 docker compose --env-file $ENVFILE -p $PROJECT -f docker/docker-compose.yml -f docker/cli.yml -f docker/docker-compose-rest.yml run --rm dspace-cli user --add -m user@test.edu -g meno -s priezvisko -l en -p user -o dataquest
+
+echo "Checking DSpace version..."
 docker compose --env-file $ENVFILE -p $PROJECT -f docker/docker-compose.yml -f docker/cli.yml -f docker/docker-compose-rest.yml run --rm dspace-cli version
 
 echo "====="

docker/docker-compose-rest.yml

@@ -36,7 +36,7 @@ services:
       dspace__P__server__P__url: ${REST_URL:-http://127.0.0.1:8080/server}
       dspace__P__ui__P__url: ${UI_URL:-http://127.0.0.1:4000}
       # db.url: Ensure we are using the 'dspacedb' image for our database
-      db__P__url: 'jdbc:postgresql://dspacedb:${PG_PORT}/dspace'
+      db__P__url: 'jdbc:postgresql://pgcit17.vsb.cz:${PG_PORT}/dspace'
       # solr.server: Ensure we are using the 'dspacesolr' image for Solr
       solr__P__server: http://dspacesolr:${SOLR_PORT}/solr
       # proxies.trusted.ipranges: This setting is required for a REST API running in Docker to trust requests
@@ -54,8 +54,6 @@ services:
       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}
-    depends_on:
-      - dspacedb
     networks:
       - dspacenet
     ports:
@@ -103,28 +101,7 @@ services:
       # /dspace/bin/dspace database migrate force
       # /dspace/bin/start-handle-server
       - |
-        while (!</dev/tcp/dspacedb/${PG_PORT}) > /dev/null 2>&1; do sleep 1; done;
         ./custom_run.sh
-  # DSpace database container
-  dspacedb:
-    restart: unless-stopped
-    container_name: dspacedb${DSPACE_PORT}
-    environment:
-      TZ: ${TIMEZONE:-Europe/Bratislava}
-      PGDATA: /pgdata
-      POSTGRES_PASSWORD: dspace
-    image: ${DSPACE_DB_IMAGE:-dataquest/dspace-postgres-pgcrypto:dspace-7_x}
-    networks:
-      dspacenet:
-    ports:
-      - published: ${PG_PORT}
-        target: ${PG_PORT}
-        host_ip: ${HOST_IP:-127.0.0.1}
-    stdin_open: true
-    tty: true
-    volumes:
-      - pgdata:/pgdata
-    command: -p ${PG_PORT}
   # DSpace Solr container
   dspacesolr:
     environment:
@@ -167,7 +144,6 @@ services:
 volumes:
   # Commented out because there are a lot of files in the assetstore
   assetstore:
-  pgdata:
   solr_data:
   # Special volume used to share Solr configs from 'dspace' to 'dspacesolr' container (see above)
   dspace_logs: