Improvement/ORCT-130/dockers dev test separation

.github/workflows/run-tests.yml

@@ -1,5 +1,5 @@
 name: Tests
-## TODO
+
 on:
   pull_request:
   push:
@@ -20,8 +20,7 @@ jobs:
         with:
           node-version: '18.x'
       - run: npm ci
-      - run: npm run docker:test
-      # - run: ./node_modules/.bin/nyc report --reporter=text-lcov > coverage.lcov
+      - run: npm run test
       - name: Send codecov report for RunConditionTable
         uses: codecov/codecov-action@v3
         with:
@@ -43,19 +42,3 @@ jobs:
       - name: Running static analysis
         run: npm run static
 
-  test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js 18.x
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18.x'
-      - name: Install mocha
-        run: npm install -g mocha
-      - name: Installing dependencies
-        run: npm ci
-      - name: Running tests
-        run: npm run docker:test

docker/application.dockerfile

@@ -1,27 +1,16 @@
 FROM node:18.16.0-buster as base 
-
     WORKDIR /opt/RunConditionTable
+
     RUN apt update -y && apt install -y \
         netcat \
         bash
+
     COPY ./package*.json ./
     RUN npm --silent ci
 
 
-FROM base as development
+FROM base as dev
     RUN apt update -y && apt install -y \
         postgresql-client
 
-    CMD [ "./scripts/check-host-and-exec.sh", "o2-rct_database", "5432", "10", "--", "npm", "run", "start:dev" ]
-
-
 FROM base as test
-
-    COPY ./.eslintrc ./
-    COPY ./.nycrc ./
-    COPY ./codecov.yml ./
-    COPY ./test ./test
-    COPY ./app ./app
-    COPY ./scripts ./scripts
-
-    CMD [ "./scripts/check-host-and-exec.sh", "o2-rct_database-test", "5432", "10", "--", "npm", "run", "test" ]

docker/database.dockerfile

@@ -1,18 +1,10 @@
 FROM postgres:14.2-bullseye as base
 
-WORKDIR /postgres/run
-
-FROM base as development
+FROM base as dev
     RUN apt update -y && \
         apt install -y \
         sudo \
         procps \
         inotify-tools
 
 FROM base as test
-
-
-
-
-
-

docker/dev.env

@@ -75,7 +75,7 @@ RCT_OPENID_WELL_KNOWN=${RCT_OPENID_WELL_KNOWN:-}
 
 ## database configuration
 ### common vars
-RCT_DB_HOST=${RCT_DB_HOST:-o2-rct_database}
+RCT_DB_HOST=${DB_CONTATINER_NAME:-${RCT_DB_HOST:-o2rct_database-dev}}
 RCT_DB_UNIXSS=${RCT_DB_UNIXSS:-/var/run/postgresql}
 RCT_DB_NAME=${RCT_DB_NAME:-rct-db}
 RCT_DB_PORT=5432
@@ -92,6 +92,3 @@ POSTGRES_HOST_AUTH_METHOD=scram-sha-256
 MOCK_DB=${MOCK_DB:-false}
 OTHER_SQL_MODIFY_DAEMON=${OTHER_SQL_MODIFY_DAEMON:-true}
 MAIN_SQL_MODIFY_DAEMON=${MAIN_SQL_MODIFY_DAEMON:-true}
-
-
-

docker/docker-compose-db-expose.yml

@@ -1,5 +1,5 @@
 services:
-  o2-rct_database:
+  database:
     ports:
       - target: $RCT_DB_PORT
-        published: $DB_EXPOSED_PORT 
+        published: $DB_EXPOSED_PORT 

docker/docker-compose-dev.yml

@@ -1,25 +1,46 @@
 
 services:
-  o2-rct_application:
-    container_name: o2-rct_application
-    build: 
-      target: development
-    env_file:
-    - ./docker/dev.env
-
+  application:
+    restart: "no"
     ports:
     - target: $RCT_HTTP_PORT
       published: $RCT_HTTP_PORT
-
 
+    volumes:
+      - type: bind
+        read_only: false
+        source: ./database/cache
+        target: /opt/RunConditionTable/database/cache
+        bind:
+          create_host_path: true
+      - type: bind
+        read_only: true
+        source: ./security
+        target: /opt/RunConditionTable/security
+        bind:
+          create_host_path: true
+
+  database:
     restart: "no"
 
-  o2-rct_database:
-    container_name: o2-rct_database
-    build: 
-      target: development
-
-    env_file:
-    - ./docker/dev.env
+    volumes:
+      - type: bind
+        read_only: true
+        source: ./database
+        target: /postgres/run/database
+      - type: bind
+        read_only: false
+        source: ./database/cache
+        target: /postgres/run/database/cache
+        bind:
+          create_host_path: true
+
 
-    restart: "no"
+networks:
+  network:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: "172.200.201.0/24"
+          gateway: "172.200.201.1"

docker/docker-compose-env.yml

@@ -0,0 +1,13 @@
+
+services:
+  application:
+    build:
+      target: $TARGET
+    env_file:
+      - ./docker/$TARGET.env
+
+  database:
+    build:
+      target: $TARGET
+    env_file:
+      - ./docker/$TARGET.env

docker/docker-compose-test.yml

@@ -1,43 +1,38 @@
 
 services:
-  o2-rct_application:
-    container_name: o2-rct_application-test
-    build: 
-      target: test
-    env_file:
-      - ./docker/test.env
+  application:
+    restart: "no"
     volumes:
-      - type: bind
-        read_only: true
-        source: ./security
-        target: /opt/RunConditionTable/security
-      - type: bind
-        read_only: false
-        source: ./database/cache
-        target: /opt/RunConditionTable/database/cache
       - type: bind
         read_only: false
         source: ./reports
         target: /opt/RunConditionTable/reports
-
-    restart: "no"
+        bind:
+          create_host_path: true
+      - type: bind
+        read_only: true
+        source: ./.eslintrc
+        target: /opt/RunConditionTable/.eslintrc
 
-  o2-rct_database:
-    container_name: o2-rct_database-test
-    build: 
-      target: test
-    env_file:
-      - ./docker/test.env
+      - type: bind
+        read_only: true
+        source: ./.nycrc
+        target: /opt/RunConditionTable/.nycrc
+
+      - type: bind
+        read_only: true
+        source: ./test
+        target: /opt/RunConditionTable/test
 
-    volumes:
-    - type: bind
-      read_only: true
-      source: ./database
-      target: /docker-entrypoint-initdb.d
-    - type: bind
-      read_only: false
-      source: ./database/cache
-      target: /postgres/run/database/cache
+
+  database:
+    restart: "no"
 
-
-    restart: "no"
+networks:
+  network:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: "172.200.202.0/24"
+          gateway: "172.200.202.1"

docker/docker-compose-volumes.yml

@@ -1,11 +1,15 @@
 version: '3.1'
 services:
-  o2-rct_application:
+  application:
     volumes:
       - type: bind
-        read_only: false
+        read_only: true
         source: ./app
         target: /opt/RunConditionTable/app
+      - type: bind
+        read_only: false
+        source: ./app/public/ # must be directory due to read_only flag conflict with previous bind
+        target: /opt/RunConditionTable/app/public/
       - type: bind
         read_only: true
         source: ./scripts
@@ -18,28 +22,10 @@ services:
         read_only: true
         source: ./package-lock.json
         target: /opt/RunConditionTable/package-lock.json
-      - type: bind
-        read_only: true
-        source: ./security
-        target: /opt/RunConditionTable/security
-      - type: bind
-        read_only: false
-        source: ./database/cache
-        target: /opt/RunConditionTable/database/cache
-      - type: bind
-        read_only: false
-        source: ./reports
-        target: /opt/RunConditionTable/reports
 
-  o2-rct_database:
+  database:
     volumes:
       - type: bind
         read_only: true
         source: ./database
         target: /docker-entrypoint-initdb.d
-      - type: bind
-        read_only: false
-        source: ./database/cache
-        target: /postgres/run/database/cache
-
-