feat: public port as environment variable

Author: keskiju

admin/webpack.config.js

@@ -14,7 +14,7 @@ const OUTPUT_DIR = '../../build';
 const ASSETS_DIR = 'assets';
 const ICON_DIR = ASSETS_DIR + '/icon.png';
 const DEV_PORT = 8080;
-const PUBLIC_PORT = 9999;
+const PUBLIC_PORT = process.env.COMMON_PUBLIC_PORT;
 
 module.exports = function(env, argv) {
   const isProd = !!env.production;

client/webpack.config.js

@@ -18,7 +18,7 @@ const OUTPUT_DIR = '../../build';
 const ASSETS_DIR = 'assets';
 const PWA_ICON_DIR = ASSETS_DIR + '/icon.png';
 const DEV_PORT = 8080;
-const PUBLIC_PORT = 9999;
+const PUBLIC_PORT = process.env.COMMON_PUBLIC_PORT;
 
 module.exports = function(env, argv) {
   const isProd = !!env.production;

docker-compose-remote.yaml

@@ -61,7 +61,7 @@ services:
       COMMON_COMPANY: companyname
       COMMON_PROJECT: server-template
       COMMON_DOMAIN: localhost
-      COMMON_URL: http://localhost:9999
+      COMMON_URL: http://localhost:_PORT_
       COMMON_DEBUG: 'false'
       COMMON_LOG_FORMAT: text
       COMMON_LOG_LEVEL: info      # trace, debug, info, warn, error, fatal

docker-compose.yaml

@@ -28,6 +28,7 @@ services:
     environment:
       COMMON_COMPANY: companyname
       COMMON_PROJECT: server-template
+      COMMON_PUBLIC_PORT: 9999
 
   server-template-client:
     container_name: server-template-client
@@ -50,6 +51,7 @@ services:
     environment:
       COMMON_COMPANY: companyname
       COMMON_PROJECT: server-template
+      COMMON_PUBLIC_PORT: 9999
       # NOTE: Database connection is for tests only
       DATABASE_HOST: server-template-database
       DATABASE_NAME: ${db_database_name}
@@ -72,6 +74,7 @@ services:
     environment:
       COMMON_COMPANY: companyname
       COMMON_PROJECT: server-template
+      COMMON_PUBLIC_PORT: 9999
       COMMON_DOMAIN: localhost
       COMMON_URL: http://localhost:9999
       COMMON_DEBUG: 'false'
@@ -105,6 +108,7 @@ services:
     environment:
       COMMON_COMPANY: companyname
       COMMON_PROJECT: server-template
+      COMMON_PUBLIC_PORT: 9999
       COMMON_DEBUG: 'false'
       COMMON_LOG_FORMAT: text
       COMMON_LOG_LEVEL: info      # trace, debug, info, warn, error, fatal
@@ -142,6 +146,8 @@ services:
       - "/service/site/node_modules"
       # FOR GATSBY ONLY:
       # - "/service/site/node_modules"
+    environment:
+      COMMON_PUBLIC_PORT: 9999
 
   server-template-cache:
     container_name: server-template-cache

scripts/helm.yaml

@@ -1,6 +1,7 @@
 global:
   domain: ${taito_domain}
   url: https://${taito_domain}
+  publicPort: 443
   logFormat: stackdriver
   logLevel: info    # trace, debug, info, warn, error, fatal
   registry: ${taito_container_registry}

scripts/helm/requirements.yaml

@@ -1,4 +1,4 @@
 dependencies:
 - name: full-stack
-  version: 0.4.0
+  version: 0.4.1
   repository: https://taitounited.github.io/taito-charts/

scripts/helm/values.yaml

@@ -23,3 +23,4 @@ global:
   logLevel: info    # trace, debug, info, warn, error, fatal
   registry: ${taito_container_registry}
   imagePullPolicy: ''
+  debug: false

scripts/taito-template/init.sh

@@ -192,11 +192,10 @@ ingress_port=$(shuf -i 8000-9999 -n 1)
 db_port=$(shuf -i 6000-7999 -n 1)
 www_port=$(shuf -i 5000-5999 -n 1)
 sed -i "s/7463/${www_port}/g" taito-config.sh docker-compose.yaml \
-  docker-compose-remote.yaml TAITOLESS.md &> /dev/null
+  TAITOLESS.md www/README.md &> /dev/null
 sed -i "s/6000/${db_port}/g" taito-config.sh docker-compose.yaml \
-  docker-compose-remote.yaml TAITOLESS.md &> /dev/null
+  TAITOLESS.md &> /dev/null
 sed -i "s/9999/${ingress_port}/g" taito-config.sh docker-compose.yaml \
-  docker-compose-remote.yaml ./admin/package.json ./client/package.json \
   TAITOLESS.md &> /dev/null || :
 
 ./scripts/taito-template/common.sh

www/develop.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+: "${COMMON_PUBLIC_PORT:?}"
 
 set -x
 
@@ -15,12 +16,12 @@ elif [ -f ./site/Gemfile ]; then
   cd /service/site && \
   bundle update && \
   bundle exec jekyll serve --host 0.0.0.0 --port 8080 \
-    --baseurl http://localhost:9999 \
-    --livereload --livereload-port 9999
+    --baseurl "http://localhost:$COMMON_PUBLIC_PORT" \
+    --livereload --livereload-port "$COMMON_PUBLIC_PORT"
 else
   # Hugo development
   cd /service/site && \
   hugo server -D --bind=0.0.0.0 --port 8080 \
-    --baseURL http://localhost:9999 --appendPort=false \
-    --liveReloadPort 9999
+    --baseURL "http://localhost:$COMMON_PUBLIC_PORT" --appendPort=false \
+    --liveReloadPort "$COMMON_PUBLIC_PORT"
 fi