Merge pull request 'chore: upgrade to 1.1.0+2.42.0' (#6) from upgrade-1.1.0+2.42.0 into main

Reviewed-on: https://git.coopcloud.tech/coop-cloud/custom-html-tiny/pulls/6

README.md

@@ -4,34 +4,25 @@ Custom HTML website, served using thttpd
 
 <!-- metadata -->
 * **Category**: Apps
-* **Status**: 0, work-in-progress
+* **Status**: 2, stable
-* **Image**: [`thttpd`](https://hub.docker.com/r/dragas/thttpd), 2, 3rd party image
+* **Image**: [`static-web-server`](https://hub.docker.com/r/joseluisq/static-web-server/), 4, upstream
 * **Healthcheck**: No
 * **Backups**: No
 * **Email**: N/A
 * **Tests**: 0
-* **SSO**: 3 (OAuth)
+* **SSO**: 1, Optional traefik forward auth
 <!-- endmetadata -->
 
 ## Basic usage
 
 1. Set up Docker Swarm and [`abra`]
 2. Deploy [`coop-cloud/traefik`]
-3. `abra app new custom-html`
+3. `abra app new custom-html-tiny`
 4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
    your Docker swarm box
 5. `abra app deploy YOURAPPDOMAIN`
 6. Copy your files to the container, using something like
 ```
-abra app YOURAPPDOMAIN cp index.html app:/content
+abra app cp YOURAPPDOMAIN index.html app:/var/www/http
 ```
 
-[`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra
-[`coop-cloud/traefik`]: https://git.autonomic.zone/coop-cloud/traefik
-
-## Git Based Usage
-
-1. Set up as above, stop at step 4.
-2. Deploy `swarm-cronjob` to the host
-3. `abra app config`, Uncomment Git lines in configuration, and set variables as appropriate.
-4. `abra app deploy YOURAPPDOMAIN`

compose.git-pull.yml

@@ -3,7 +3,7 @@ services:
   git:
     environment:
       - GIT_REPO_URL
-    image: alpine/git:v2.36.3
+    image: alpine/git:v2.52.0
     entrypoint: /docker-entrypoint.sh
     volumes:
       - content:/git

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: joseluisq/static-web-server:2.38.0
+    image: joseluisq/static-web-server:2.42.0
     command:  ["-a", "0.0.0.0", "-p", "80", "-g", "warn", "-d", "/var/www/http/$HTTP_SUBDIR"]
     networks:
       - proxy
@@ -17,7 +17,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         # Redirect from EXTRA_DOMAINS to DOMAIN
-        - "coop-cloud.${STACK_NAME}.version=1.0.0+2.38.0"
+        - "coop-cloud.${STACK_NAME}.version=1.1.0+2.42.0"
     environment:
       - HTTP_SUBDIR
     volumes: