update fixing configurability of the nodeJS docker container

UnterrainerInformatik · Apr 5, 2024 · 8866894 · 8866894
1 parent c04e800
commit 8866894
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/docs-local.yml b/.github/workflows/docs-local.yml
@@ -137,6 +137,8 @@ jobs:
       - name: Fill .env file for deployment
         run: |
             echo WEBSERVER_PORT=${{ secrets.WEBSERVER_PORT }} >> ./deploy/.env
+            echo INTERNAL_PORT=${{ secrets.PORT }} >> ./deploy/.env
+            echo DOCKER_HUB_USER=${{ secrets.DOCKER_HUB_USER }} >> ./deploy/.env
       - name: Deploy using SSH 🚛
         uses: UnterrainerInformatik/ssh-deploy-action@v1
         with:

diff --git a/README.md b/README.md
@@ -249,7 +249,7 @@ To build, there is a Github action in this repository, but in order to configure
 | DOCKER_HUB_PASSWORD    | An access-token of your docker-hub account.                                                                                                                                                                                                                                                                                                                                                                     |
 | DOCKER_HUB_USER        | The user of your docker-hub account.                                                                                                                                                                                                                                                                                                                                                                            |
 | KEYCLOAK_FILE          | The copy-pasted contents of the file you get when you enter your Keycloak-realm as admin -> Client -> Installation -> Keycloak JSON File.                                                                                                                                                                                                                                                                       |
-| PORT                   | -> `.env`<br>The port your web-server will be accessible when started later on.<br>This variable will be written to a newly generated `.env` file that will reside in the root-directory of the node web-server.<br>So that port is INSIDE this web-servers' docker-image that is created.                                                                                                                      |
+| PORT                   | -> `.env`<br>The port your web-server will be accessible when started later on (for example: `8080`).<br>This variable will be written to a newly generated `.env` file that will reside in the root-directory of the node web-server.<br>So that port is INSIDE this web-servers' docker-image that is created.                                                                                                |
 | WEBSERVER_PORT         | This is the EXTERNAL port of the web-server that is created.<br>This port must be unique and accessible on the deployment-machine.                                                                                                                                                                                                                                                                              |
 | VPN_OVPN_FILE          | The OVPN file of your Open VPN configuration. This is used to reach the deployment-server (target host) to start conversation via SSH.                                                                                                                                                                                                                                                                          |
 | VPN_PASSWORD           | The password of your VPN connection.                                                                                                                                                                                                                                                                                                                                                                            |

diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
@@ -2,11 +2,11 @@ version: '3'
 services:
 
   test:
-    image: gufalcon/safe-learn:latest
+    image: ${DOCKER_HUB_USER}/safe-learn:latest
     container_name: safe-learn
     restart: unless-stopped
     ports:
-      - "1112:8080"
+      - "${WEBSERVER_PORT}:${INTERNAL_PORT}"
 
 networks:
   default: