updated image to v0.40

CHANGELOG.md

@@ -2,7 +2,7 @@
 * Pages rewritten to use HTMX.
 * Removed Socket.io.
 * Changed view files to *.HTML instead of *.EJS.
-* Improved Dockerfile.
+* Removed "USER root" from Dockerfile.
 * Express sessions configured to use memorystore.
 * Improved chart rendering.
 * Improvements to container charts.
@@ -20,6 +20,7 @@
 * Container charts only rendered if container running.
 * Created permissions modal.
 * Podman support (untested).
+* Started a new template for FOSS apps.
 
 ## v0.20 (Jan 20th 2024) - The rewrite. Jumping all the way to v0.20.
 * Changed to ES6 imports.

Dockerfile

@@ -1,17 +1,7 @@
 FROM node:21-alpine
 ENV NODE_ENV=production
-
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log
-
 WORKDIR /app
-
-RUN chown node:node /app
-USER node
-
-COPY package.json package-lock.json* /app/
-RUN npm ci && npm cache clean --force
 COPY . /app
+RUN npm install
 EXPOSE 8000
-CMD ["node", "server.js"]
+CMD node server.js

README.md

@@ -53,9 +53,8 @@ version: "3.9"
 services:
   dweebui:
     container_name: dweebui
-    image: lllllllillllllillll/dweebui:v0.20
+    image: lllllllillllllillll/dweebui:v0.40
     environment:
-      NODE_ENV: production
       PORT: 8000
       SECRET: MrWiskers
     restart: unless-stopped
@@ -63,7 +62,11 @@ services:
       - 8000:8000
     volumes:
       - dweebui:/app
+      # Docker socket
       - /var/run/docker.sock:/var/run/docker.sock
+      # Podman socket
+      #- /run/podman/podman.sock:/var/run/docker.sock
+
     networks:
       - dweebui_net
 

docker-compose.yaml

@@ -2,7 +2,7 @@ version: "3.9"
 services:
   dweebui:
     container_name: dweebui
-    image: lllllllillllllillll/dweebui:v0.40-dev
+    image: lllllllillllllillll/dweebui:v0.40
     environment:
       PORT: 8000
       SECRET: MrWiskers
@@ -10,11 +10,12 @@ services:
     ports:
       - 8000:8000
     volumes:
-      - dweebui:/app/database/db.sqlite
+      - dweebui:/app
       # Docker socket
       - /var/run/docker.sock:/var/run/docker.sock
       # Podman socket
-      #- /var/run/podman/podman.sock:/var/run/docker.sock
+      #- /run/podman/podman.sock:/var/run/docker.sock
+
     networks:
       - dweebui_net
 
@@ -23,4 +24,4 @@ volumes:
 
 networks:
   dweebui_net:
-    driver: bridge
+    driver: bridge

functions/install.js

@@ -168,6 +168,7 @@ export const Install = async (req, res) => {
             try {   
                 mkdirSync(`./appdata/${name}`, { recursive: true });
                 writeFileSync(`./appdata/${name}/docker-compose.yml`, compose_file, function (err) { console.log(err) });
+                var compose = new DockerodeCompose(docker, `./appdata/${name}/docker-compose.yml`, `${name}`);
 
             } catch { 
                 const syslog = await Syslog.create({
@@ -179,8 +180,6 @@ export const Install = async (req, res) => {
                 });
              }
 
-            var compose = new DockerodeCompose(docker, `./appdata/${name}/docker-compose.yml`, `${name}`);
-
             try {
                 (async () => {
                     await compose.pull();