separate from home

docker-compose.yml

@@ -1,30 +1,27 @@
-services:
-  activities:
-    image: lovasoa/sqlpage:latest
-    hostname: activities
-    volumes:
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-      - ./activities/www/:/var/www/
-      - ./activities/sqlpage:/etc/sqlpage/
-      - ./activities/activities.db:/var/www/activities.db
-    networks:
-      - traefik
-    restart: always
+---
+x-podman:
+  in_pod: false
 
-  util-sqlpage:
-    image: lovasoa/sqlpage:latest
+services:
+  web:
+    image: docker.io/lovasoa/sqlpage:latest
     hostname: util-sqlpage
+    user: "1000:1000"
+    userns_mode: "keep-id:uid=1000,gid=1000"
     volumes:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
       - ./util-sqlpage/:/var/www/
       - ./util-sqlpage/sqlpage:/etc/sqlpage:ro
+    ports:
+      - 192.168.0.20:8091:8080
+    expose:
+      - 8080
     networks:
-      - traefik
-    restart: always
+      - priv
+    restart: unless-stopped
 
-  util-pyapi:
+  proxy:
     image: util-pyapi
     hostname: util-pyapi
     build:
@@ -32,58 +29,17 @@ services:
       dockerfile: rest/Dockerfile
     volumes:
       - ./util-sqlpage/util.db:/usr/src/app/util.db:ro
+    ports:
+      - 192.168.0.20:6771:6772
     expose:
       - 6772
     networks:
-      - traefik
-    restart: always
-
-  home-sqlpage:
-    image: lovasoa/sqlpage:latest
-    hostname: home-sqlpage
-    volumes:
-      - ./home-sqlpage/:/var/www/
-      - ./home-sqlpage.json:/etc/sqlpage/sqlpage.json
-      - ./home-sqlpage/sqlpage/migrations:/etc/sqlpage/migrations
-    expose:
-      - 8080
-    networks:
-      - traefik
-    restart: always
-
-  home:
-    image: home-launcher
-    hostname: home-launcher
-    build: .
-    expose:
-      - 80
-    restart: always
-    volumes:
-      - /home/pi/www/feed:/usr/share/nginx/html/feed
-      - /home/cropswap-archive/www:/usr/share/nginx/html/mail-archive
-      - ./media:/usr/share/nginx/html/media
-      - ./fdroid:/usr/share/nginx/html/fdroid
-      - /home/pi/syncthing/wyn-apps:/usr/share/nginx/html/fdroid/repo
-      - ./.well-known:/usr/share/nginx/html/.well-known
-    networks:
-      - traefik
-
-  auth:
-    image: auth
-    hostname: auth
-    build:
-      context: .
-      dockerfile: Dockerfile-auth
-    volumes:
-      - /etc/private-ca:/etc/private-ca:ro
-      - ./hashes.py:/usr/src/app/hashes.py
-    expose:
-      - 1234
-    networks:
-      - traefik
-    restart: always
+      - priv
+    restart: unless-stopped
 
 networks:
-  traefik:
-    external: true
-
+  priv:
+    enable_ipv6: true
+    ipam:
+      config:
+       - subnet: fd00:0005::/64