added script to initialize ngas db in the existing postgres container

ci/psql/Dockerfile.db

 FROM postgres:12.6-alpine
 
-COPY ./ci/psql/test_data_archive.sql.gz /docker-entrypoint-initdb.d/test_data_archive.sql.gz
+ARG NGAS_VERSION=11.0.2
+
+WORKDIR /repos
+
+RUN apk add git && \
+    git clone --depth 1 --branch "v${NGAS_VERSION}" https://github.com/ICRAR/ngas.git
+
+WORKDIR /
+
+COPY ./ci/psql/init_ngas_db.sh ./ci/psql/test_data_archive.sql.gz /docker-entrypoint-initdb.d/
 
 CMD ["postgres"]
\ No newline at end of file

ci/psql/Dockerfile.db-ngas

-FROM postgres:12.6-alpine
-
-ARG NGAS_VERSION=11.0.2
-
-WORKDIR /repos
-
-RUN apk add git && \
-    git clone --depth 1 --branch "v${NGAS_VERSION}" https://github.com/ICRAR/ngas.git && \
-    cp ngas/src/ngamsCore/ngamsSql/ngamsCreateTables-PostgreSQL.sql /docker-entrypoint-initdb.d/ngamsCreateTables-PostgreSQL.sql

ci/psql/init_ngas_db.sh

+#!/bin/bash
+
+set -e
+set -o pipefail
+
+DB=ngas
+PATH_TO_SQL_FILE=/repos/ngas/src/ngamsCore/ngamsSql/ngamsCreateTables-PostgreSQL.sql
+
+echo "Creating database '$DB' "
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+        CREATE DATABASE $DB;
+        GRANT ALL PRIVILEGES ON DATABASE $DB TO archive;
+EOSQL
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname $DB < $PATH_TO_SQL_FILE
+
+echo "'$DB' was created successfully"

docker-compose.yml

@@ -22,16 +22,6 @@ services:
       POSTGRES_PASSWORD: docker
     command: postgres -c listen_addresses=*
 
-  db-ngas:
-    image: ssa-containers.aoc.nrao.edu/ops/ci/db-ngas:workspaces
-    restart: always
-    ports:
-      - "54323:5432"
-    environment:
-      POSTGRES_USER: ngas
-      POSTGRES_PASSWORD: docker
-    command: postgres -c listen_addresses=*
-
   amqp:
     image: rabbitmq:3.8-management
     restart: always
@@ -57,6 +47,8 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile.ngas
+    depends_on:
+      - db
     ports:
       - "7777:7777"
     volumes:

local_ngas_root/cfg/ngamsServer.conf

@@ -120,7 +120,7 @@ passwords will be expressed literally.
 	-->
 	<Log Id="Log" LocalLogFile="log/LogFile.nglog" LocalLogLevel="4"
 	     LogRotateCache="30" LogRotateInt="01T00:00:00" SysLog="0"
-	     SysLogPrefix="ngas" ArchiveRotatedLogfiles="1"/>
+	     SysLogPrefix="ngas" ArchiveRotatedLogfiles="0"/>
 
 	<!--
 	    Archiving configuration
@@ -182,7 +182,7 @@ passwords will be expressed literally.
         MaxPoolConnections="5" UseFileIgnore="true"
         database="/tmp/ngas.sqlite"/> -->
     <Db Id="Db" Snapshot="0" Interface="psycopg2" UseFileIgnore="true"
-        host="db-ngas" dbname="ngas" user="ngas"
+        host="db" dbname="ngas" user="archive"
         password="docker"/>
 
 	<!--