migrate to podman

Dockerfile

@@ -1,5 +1,5 @@
 FROM nginx:alpine
 COPY nginx.conf /etc/nginx/nginx.conf
-COPY prayer-generator/license /usr/share/nginx/html/license
+COPY pg/license /usr/share/nginx/html/license
 COPY css /usr/share/nginx/html/css
 COPY robots.txt /usr/share/nginx/html

docker-compose.yml

@@ -1,24 +1,57 @@
+---
+x-podman:
+  in_pod: false
+
 services:
-  activities:
-    image: lovasoa/sqlpage:latest
+  activity:
+    image: docker.io/lovasoa/sqlpage:latest
     hostname: activities
+    user: "1000:1000"
+    userns_mode: "keep-id:uid=1000,gid=1000"
+    restart: unless-stopped
     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
+    ports:
+      - 192.168.0.20:8789:8080
+    expose:
+      - 8080
     networks:
-      - traefik
-    restart: always
+      - priv
 
-  home:
+  landing:
+    image: docker.io/lovasoa/sqlpage:latest
+    hostname: home-sqlpage
+    user: "1000:1000"
+    userns_mode: "keep-id:uid=1000,gid=1000"
+    restart: unless-stopped
+    volumes:
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+      - ./home-sqlpage/:/var/www/
+      - ./home-sqlpage.json:/etc/sqlpage/sqlpage.json
+      - ./home-sqlpage/sqlpage/migrations:/etc/sqlpage/migrations
+    ports:
+      - 192.168.0.20:8092:8080
+    expose:
+      - 8080
+    networks:
+      - priv
+
+  proxy:
     image: home-launcher
     hostname: home-launcher
+    #user: "1000:1000"
+    #userns_mode: "keep-id:uid=1000,gid=1000"
+    restart: unless-stopped
     build: .
+    ports:
+      - 192.168.0.20:8989:80
     expose:
       - 80
-    restart: always
     volumes:
       - /home/pi/www/feed:/usr/share/nginx/html/feed
       - /home/cropswap-archive/www:/usr/share/nginx/html/mail-archive
@@ -27,9 +60,11 @@ services:
       - /home/pi/syncthing/wyn-apps:/usr/share/nginx/html/fdroid/repo
       - ./.well-known:/usr/share/nginx/html/.well-known
     networks:
-      - traefik
+      - priv
 
 networks:
-  traefik:
-    external: true
-
+  priv:
+    enable_ipv6: true
+    ipam:
+      config:
+       - subnet: fd00:0008::/64

pg/license/ESV.txt

@@ -0,0 +1 @@
+Scripture quotations marked ESV are from The Holy Bible, English Standard Version, copyright © 2001 by Crossway Bibles, a division of Good News Publishers. Used by permission. All rights reserved.

pg/license/KJV.txt

@@ -0,0 +1 @@
+General public license for distribution for any purpose. Rights in The Authorized Version of the Bible (King James Bible) in the United Kingdom are vested in the Crown and administered by the Crown’s patentee, Cambridge University Press.

pg/license/MKJV.txt

@@ -0,0 +1 @@
+Copyright (c) Jay P. Green, Sr. 1993. Licensed for non-commercial distribution granted to CrossWire on Oct. 3, 2002

pg/license/UKJV.txt

@@ -0,0 +1 @@
+Freely distributable. Public Domain. I love Jesus (UKJV).

pg/license/WEB.txt

@@ -0,0 +1 @@
+The World English Bible is a 1997 revision of the American Standard Version of the Holy Bible, first published in 1901. It is in the Public Domain. Please feel free to copy and distribute it freely.