frontend working

.env-production

@@ -1,4 +1,4 @@
-URL_INTERNAL=0.0.0.0
+URL_INTERNAL=127.0.0.1
-URL_EXTERNAL=cms.marcleopold.inset.uk
+URL_EXTERNAL=https://cms.marcleopold.isnet.uk
 PORT_APP=3003
 PORT_SERVER=3004

.gitignore

@@ -80,3 +80,4 @@ dist
 # IDE
 .idea
 Session.vim
+*.un~

app/Dockerfile

@@ -8,6 +8,6 @@ ADD . ${APP_ROOT}
 
 RUN npm install
 RUN npm rebuild node-sass
-# RUN npm run build
+RUN npm run build
 
 ENV HOST 0.0.0.0

app/nuxt.config.js

@@ -5,7 +5,7 @@ module.exports = {
 
   server: {
     port: process.env.PORT_APP,
-    host: process.env.URL_INTERNAL,
+    host: '0.0.0.0',
   },
 
   serverMiddleware: [

docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - PORT_APP=${PORT_APP}
       - PORT_SERVER=${PORT_SERVER}
     command:
-      "npm run dev"
+      "npm run start"
 
   octobercms:
     image: aspendigital/octobercms:latest
@@ -25,6 +25,8 @@ services:
       - ENABLE_CRON=true
       - APP_DEBUG=false
       - INIT_PLUGINS=true
+      - APP_URL=${URL_EXTERNAL}
+      - CMS_LINK_POLICY=force
     volumes:
       - ./server/plugins:/var/www/html/plugins
       - ./server/storage/app:/var/www/html/storage/app

etc/nginx/sites-available/marcleopold

@@ -1,3 +1,22 @@
+server {
+	listen 80;
+	listen [::]80;
+
+	server_name marcleopold.isnet.uk;
+
+	location / {
+		proxy_buffering off;
+		proxy_redirect http:://127.0.0.1:3003/ /;
+		proxy_pass http://127.0.0.1:3003/;
+		proxy_set_header X-Real-IP $remote_addr;
+		proxy_set_header X-Forwarded-For $remote_addr;
+		proxy_set_header Host $host;
+		proxy_set_header X-Forwarded-Host $host;
+		proxy_set_header X-Forwarded-Proto $scheme;
+	}
+
+}
+
 server {
 
 	server_name cms.marcleopold.isnet.uk;
@@ -33,22 +52,3 @@ server {
 	server_name cms.marcleopold.isnet.uk;
     return 404; # managed by Certbot
 }
-
-server {
-	listen 80;
-	listen [::]80;
-
-	server_name marcleopold.isnet.uk;
-
-	location / {
-		proxy_buffering off;
-		proxy_redirect http:://127.0.0.1:3003/ /;
-		proxy_pass http://127.0.0.1:3003/;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $remote_addr;
-		proxy_set_header Host $host;
-		proxy_set_header X-Forwarded-Host $host;
-		proxy_set_header X-Forwarded-Proto $scheme;
-	}
-
-}