refactored dev hostnames for screenshot service, because localhost context is not flexible enough, now http://www:8000 instead of http://localhost:8080 as dev url

Author: yvess

django/main/settings.py

@@ -129,6 +129,8 @@
 CORS_ORIGIN_WHITELIST = [
     "http://localhost:8080",
     "http://localhost:8081",
+    "http://www:8000",
+    "http://www.local:8000",
 ]
 CORS_ALLOW_CREDENTIALS = True
 CACHES = {

docker-compose.yml

@@ -27,7 +27,7 @@ services:
     environment:
       - TERM=xterm-256color
       - START_SCREENSHOTSERVICE=NO
-      - PUBLIC_URL=http://localhost:8080
+      - PUBLIC_URL=http://www:8000
       - VUE_APP_MAPBOX_ACCESSTOKEN=pk.eyJ1IjoiZ2VtZWluZGVzY2FuIiwiYSI6ImNrNXdrOXV2ZjEwdXcza28wcXNoYXE1ZGMifQ.P-nCvxNRK4AOs7YdRbHCLg
       - VUE_APP_MAPBOX_DEFAULT_STYLES=mapbox://styles/gemeindescan/ck6rp249516tg1iqkmt48o4pz
     working_dir: /opt/vue
@@ -36,7 +36,7 @@ services:
       - var-gemeindescan-webui:/var/services/
       - vscode-remote-vue:/root/.vscode-server
     ports:
-      # - "9222:9222" # debug chrome
+      - "9222:9222" # debug chrome
       - "8079:8079" # snapshost service
       - "10001:10001" # vscode
 
@@ -55,14 +55,12 @@ services:
       - DJANGO_HTTPS=False
       - DJANGO_EMAIL_HOST=maildev
       - DJANGO_SECRET_KEY=adddxxccxx4rt0ioywg3yf5kjq64-t5
-      - DJANGO_ALLOWED_HOSTS=local.gemeindescan.ch,localhost,django
+      - DJANGO_ALLOWED_HOSTS=www,www.local,localhost,django
     working_dir: /opt/app
     volumes:
       - ./django:/opt/app
       - var-gemeindescan-webui:/var/services
       - vscode-remote-django:/root/.vscode-server
-    links:
-     - pdb
     ports:
       - "10002:10002" # vscode
     # entrypoint: tail
@@ -74,9 +72,6 @@ services:
     volumes:
       - ./etc/nginx:/etc/nginx/conf.d
       - var-gemeindescan-webui:/var/services
-    links:
-      - django
-      - vue
     ports:
-      - 8080:80
+      - 8000:8000
     # command: tail -f /dev/null

etc/nginx/localhost.conf renamed to etc/nginx/www.local.conf

@@ -7,11 +7,11 @@ upstream vue-dev {
 }
 
 server {
-    listen 80;
-    server_name localhost;
+    listen 8000;
+    server_name www www.local;
 
-    access_log /var/log/localhost.access.log;
-    error_log /var/log/localhost.error.log error;
+    access_log /var/log/local.www.access.log;
+    error_log /var/log/local.www.error.log error;
 
     client_max_body_size 10M;
 
@@ -20,7 +20,7 @@ server {
     location = / {
         set $lang_sup "de,fr";
         set_by_lua_file $lang_accept /etc/nginx/conf.d/lang.lua $lang_sup;
-        return $scheme://$host:8080/$lang_accept;
+        return $scheme://$host:8000/$lang_accept;
     }
 
 
@@ -89,7 +89,7 @@ server {
 
     # vue dev server mode hotreload
     location /sockjs-node {
-        proxy_pass http://vue:8080;
+        proxy_pass http://vue-dev;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP  $remote_addr;
         proxy_set_header X-Forwarded-For $remote_addr;

vue/vue.config.js

@@ -1,4 +1,16 @@
 module.exports = {
+  devServer: {
+    compress: true,
+    inline: true,
+    port: '8080',
+    public: 'www',
+    allowedHosts: [
+      'www',
+      'www.local',
+      'localhost',
+      'vue'
+    ]
+  },
   transpileDependencies: [
     'vuetify'
   ],