Bläddra i källkod

Added pm2 to dockerfile. NO_AUTH env.

lllllllillllllillll 1 år sedan
förälder
incheckning
6c15c28c2e
4 ändrade filer med 9 tillägg och 7 borttagningar
  1. 2 1
      Dockerfile
  2. 3 2
      controllers/dashboard.js
  3. 1 1
      controllers/networks.js
  4. 3 3
      router/index.js

+ 2 - 1
Dockerfile

@@ -3,6 +3,7 @@ ENV NODE_ENV=production
 WORKDIR /app
 WORKDIR /app
 COPY package.json /app
 COPY package.json /app
 RUN npm install
 RUN npm install
+RUN npm install pm2 -g
 COPY . /app
 COPY . /app
 EXPOSE 8000
 EXPOSE 8000
-CMD ["node", "server.js"]
+CMD ["pm2-runtime", "server.js"]

+ 3 - 2
controllers/dashboard.js

@@ -13,13 +13,14 @@ let [ports_data, volumes_data, env_data, label_data] = [[], [], [], []];
 // The page
 // The page
 export const Dashboard = (req, res) => {
 export const Dashboard = (req, res) => {
 
 
-    let name = req.session.user;
+    let name = req.session.user || 'Local';
+    let avatar = name.charAt(0).toUpperCase();
     let role = req.session.role;
     let role = req.session.role;
     alert = req.session.alert;
     alert = req.session.alert;
     
     
     res.render("dashboard", {
     res.render("dashboard", {
         name: name,
         name: name,
-        avatar: name.charAt(0).toUpperCase(),
+        avatar: avatar,
         role: role,
         role: role,
         alert: alert,
         alert: alert,
     });
     });

+ 1 - 1
controllers/networks.js

@@ -8,7 +8,7 @@ export const Networks = async function(req, res) {
     let containers = await docker.listContainers({ all: true });
     let containers = await docker.listContainers({ all: true });
     // Loop through the containers to find out which networks are being used
     // Loop through the containers to find out which networks are being used
     for (let i = 0; i < containers.length; i++) {
     for (let i = 0; i < containers.length; i++) {
-        console.log(Object.keys(containers[i].NetworkSettings.Networks)[0]);
+        // console.log(Object.keys(containers[i].NetworkSettings.Networks)[0]);
         try { network_name += containers[i].HostConfig.NetworkMode; } catch {}
         try { network_name += containers[i].HostConfig.NetworkMode; } catch {}
         try { container_networks.push(containers[i].NetworkSettings.Networks[network_name].NetworkID); } catch {}
         try { container_networks.push(containers[i].NetworkSettings.Networks[network_name].NetworkID); } catch {}
     }
     }

+ 3 - 3
router/index.js

@@ -23,19 +23,19 @@ import { Uninstall } from "../utils/uninstall.js"
 // Permission Middleware
 // Permission Middleware
 const adminOnly = async (req, res, next) => {
 const adminOnly = async (req, res, next) => {
     if (req.session.role == 'admin') { next(); }
     if (req.session.role == 'admin') { next(); }
-    else if (no_auth && req.connection.remoteAddress == '::ffff:127.0.0.1') { next(); }
+    else if (no_auth && req.hostname == 'localhost') { next(); }
     else { res.redirect('/dashboard'); }
     else { res.redirect('/dashboard'); }
 }
 }
 
 
 const sessionCheck = async (req, res, next) => {
 const sessionCheck = async (req, res, next) => {
     if (req.session.user) { next(); }
     if (req.session.user) { next(); }
-    else if (no_auth && req.connection.remoteAddress == '::ffff:127.0.0.1') { next(); }
+    else if (no_auth && req.hostname == 'localhost') { next(); }
     else { res.redirect('/login'); }
     else { res.redirect('/login'); }
 }
 }
 
 
 const permissionCheck = async (req, res, next) => {
 const permissionCheck = async (req, res, next) => {
     if (req.session.role == 'admin') { next(); return; }
     if (req.session.role == 'admin') { next(); return; }
-    else if (no_auth && req.connection.remoteAddress == '::ffff:127.0.0.1') { next(); }
+    else if (no_auth && req.hostname == 'localhost') { next(); }
     let user = req.session.user;
     let user = req.session.user;
     let action = req.path.split("/")[2];
     let action = req.path.split("/")[2];
     let trigger = req.header('hx-trigger-name');
     let trigger = req.header('hx-trigger-name');