Adding dependencies to containers.

diff --git a/docker-compose.yml b/docker-compose.yml
index 22a0d8bc8aa5e6f2773fb093eb7fbe0f821373ae..1258b32129051fd6502b8087d69ece8eccaa8245 100755 (executable)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -49,7 +49,7 @@ services:
       - /home/git:/home/git
       - ./volumes/phs-api/npmcache:/root/.npm-cache
     ports:
-      - 23602:3601
+      - "23602:3601"
     depends_on:
       db:
         condition: service_healthy
@@ -72,7 +72,7 @@ services:
     volumes:
       - ./volumes/phs-home:/usr/src/app
     ports:
-      - 30007:3000
+      - "30007:3000"
     depends_on:
       - db
       - api
@@ -125,7 +125,7 @@ services:
     volumes:
       - ./volumes/phs-admin:/usr/src/app
     ports:
-      - 30008:3000
+      - "30008:3000"
     depends_on:
       - db
       - api
@@ -133,12 +133,5 @@ services:
       - phs-net
     restart: unless-stopped
     entrypoint: sh -c "/usr/src/app/run-admin.sh"
-  openvpn-proxy:
-    image: alpine/socat
-    container_name: openvpn-proxy
-    command: tcp-listen:7505,fork,reuseaddr tcp-connect:172.17.0.1:7505
-    networks:
-      - phs-net
-    restart: unless-stopped
 networks:
   phs-net:

diff --git a/images/phs-api/Dockerfile b/images/phs-api/Dockerfile
index a601fda432acc973c3b5e6022ad3fc974f8ae733..c76f7491a32dfb6682d1bd738263c03e0f9d66d9 100755 (executable)
--- a/images/phs-api/Dockerfile
+++ b/images/phs-api/Dockerfile
@@ -4,7 +4,7 @@ RUN groupmod -g 1000 node && usermod -u 1000 -g 1000 node
 
 RUN npm install nodemon -g
 RUN npm install -g ts-node
-RUN apt update && apt install -y vim mlocate openssh-client docker.io && rm -r /var/lib/apt/lists/*
+RUN apt update && apt install -y vim mlocate openssh-client docker.io telnet && rm -r /var/lib/apt/lists/*
 RUN groupadd -f docker && groupmod -g 111 docker && usermod -a -G docker node
 
 USER node