Compare commits

...

7 Commits

Author SHA1 Message Date
3wc
29041d2c81 chore: publish 1.2.1+1.21.6 release 2022-04-02 15:32:55 +02:00
3wc
232a953788 chore: publish 1.2.0+1.21.3 release 2022-03-23 12:01:09 +02:00
3wc
2158fa1fc4 Add git-pull functionality 💅 2022-03-23 11:57:26 +02:00
3wc
b8dec9d61a Add optional traefik-forward-auth login 2021-11-23 13:44:16 +02:00
3wc
8550b91477 Mass README update 2021-11-23 13:44:09 +02:00
888fa11631 fix: ensure that this default conf file is set 2021-10-12 09:50:56 +02:00
7bfaa478a1 chore: new v1.21 release 2021-10-12 09:23:47 +02:00
11 changed files with 63 additions and 5 deletions

BIN
.abra.sh.swp Normal file

Binary file not shown.

BIN
.compose.git-pull.yml.swp Normal file

Binary file not shown.

BIN
.entrypoint.git-pull.sh.swp Normal file

Binary file not shown.

View File

@ -4,3 +4,13 @@ DOMAIN=custom-html.example.com
## Domain aliases ## Domain aliases
#EXTRA_DOMAINS=', `www.custom-html.example.com`' #EXTRA_DOMAINS=', `www.custom-html.example.com`'
LETS_ENCRYPT_ENV=production LETS_ENCRYPT_ENV=production
COMPOSE_FILE="compose.yml"
# Single Sign On via Traefik "file provider"
#COMPOSE_FILE="$COMPOSE_FILE:compose.sso.yml"
# Git-pull regularly
#COMPOSE_FILE="$COMPOSE_FILE:compose.git-pull.yml"
#GIT_REPO_URL="https://git.coopcloud.tech/dalmationer/hexbomb.gay"
#CRON_SCHEDULE="*/1 * * * *"

BIN
.env.sample.swp Normal file

Binary file not shown.

View File

@ -4,12 +4,12 @@ Custom HTML website, served using Nginx.
<!-- metadata --> <!-- metadata -->
* **Category**: Apps * **Category**: Apps
* **Status**: ❷💛 * **Status**: 2, beta
* **Image**: [`nginx`](https://hub.docker.com/_/nginx), ❶💚, upstream * **Image**: [`nginx`](https://hub.docker.com/_/nginx), 4, upstream
* **Healthcheck**: No * **Healthcheck**: No
* **Backups**: No * **Backups**: No
* **Email**: N/A * **Email**: N/A
* **Tests**: ❷💛 * **Tests**: 2
* **SSO**: No * **SSO**: No
<!-- endmetadata --> <!-- endmetadata -->

View File

@ -1 +1,2 @@
export NGINX_DEFAULT_CONF_VERSION=v1 export NGINX_DEFAULT_CONF_VERSION=v1
export ENTRYPOINT_CONF_VERSION=v3

26
compose.git-pull.yml Normal file
View File

@ -0,0 +1,26 @@
version: "3.8"
services:
git:
environment:
- GIT_REPO_URL
image: alpine/git:v2.32.0
entrypoint: /docker-entrypoint.sh
volumes:
- content:/git
configs:
- source: entrypoint_conf
target: /docker-entrypoint.sh
mode: 0555
deploy:
mode: replicated
replicas: 0
labels:
- "swarm.cronjob.enable=true"
- "swarm.cronjob.schedule=${CRON_SCHEDULE:-*/5 * * * *}"
restart_policy:
condition: none
configs:
entrypoint_conf:
name: ${STACK_NAME}_entrypoint_conf_${ENTRYPOINT_CONF_VERSION}
file: entrypoint.git-pull.sh

8
compose.sso.yml Normal file
View File

@ -0,0 +1,8 @@
version: "3.8"
services:
app:
environment:
- TFA_MIDDLEWARE_NAME
deploy:
labels:
- "traefik.http.routers.${STACK_NAME}.middlewares=${TFA_MIDDLEWARE_NAME}@file"

View File

@ -3,7 +3,7 @@ version: "3.8"
services: services:
app: app:
image: nginx:1.19.2 image: nginx:1.21.6
networks: networks:
- proxy - proxy
deploy: deploy:
@ -19,7 +19,9 @@ services:
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
- "coop-cloud.${STACK_NAME}.version=1.0.0+1.19.2" - "coop-cloud.${STACK_NAME}.version=1.2.1+1.21.6"
environment:
DEFAULT_CONF_FILE: /etc/nginx/conf.d/default.conf
volumes: volumes:
- content:/usr/share/nginx/html - content:/usr/share/nginx/html
configs: configs:

11
entrypoint.git-pull.sh Normal file
View File

@ -0,0 +1,11 @@
#!/bin/sh
if [ ! -d /git/.git ]; then
echo "No repo found, emptying /git/ directory"
rm -r /git/*
echo "Cloning $GIT_REPO_URL into /git"
git clone "$GIT_REPO_URL" /git
else
echo "Updating /git"
git pull
fi