diff --git a/configure-instance.sh b/configure-instance.sh index 7f96784..7811040 100755 --- a/configure-instance.sh +++ b/configure-instance.sh @@ -4,15 +4,6 @@ if [ -z "$(which docker-compose)" ]; then exit 1 fi -# Docker-Compose version check, to prevent "Unsupported configuration option" -COMPOSE_VERSION=$(docker-compose version --short 2>/dev/null || docker compose version --short 2>/dev/null) -REQUIRED_COMPOSE_VERSION="1.28.0" -if [[ $(printf '%s\n' "$REQUIRED_COMPOSE_VERSION" "$COMPOSE_VERSION" | sort -V | head -n1) != $REQUIRED_COMPOSE_VERSION ]]; then - echo "Your docker-compose version of $COMPOSE_VERSION is too old. Please upgrade to $REQUIRED_COMPOSE_VERSION or higher." - echo "See https://docs.docker.com/compose/install/#install-compose for installation instructions." - exit 1 -fi - echo "Enter a hostname for the Frontend (eg: piped.kavin.rocks):" && read -r frontend echo "Enter a hostname for the Backend (eg: pipedapi.kavin.rocks):" && read -r backend echo "Enter a hostname for the Proxy (eg: pipedproxy.kavin.rocks):" && read -r proxy diff --git a/template/docker-compose.caddy.yml b/template/docker-compose.caddy.yml index 761eb49..263019e 100644 --- a/template/docker-compose.caddy.yml +++ b/template/docker-compose.caddy.yml @@ -1,3 +1,5 @@ +version: "3" + services: pipedfrontend: image: 1337kavin/piped-frontend:latest @@ -5,9 +7,7 @@ services: depends_on: - piped container_name: piped-frontend - entrypoint: ash -c 'sed -i s/pipedapi.kavin.rocks/BACKEND_HOSTNAME/g - /usr/share/nginx/html/assets/* && /docker-entrypoint.sh && nginx -g - "daemon off;"' + entrypoint: ash -c 'sed -i s/pipedapi.kavin.rocks/BACKEND_HOSTNAME/g /usr/share/nginx/html/assets/* && /docker-entrypoint.sh && nginx -g "daemon off;"' ytproxy: image: 1337kavin/ytproxy:latest restart: unless-stopped @@ -31,8 +31,7 @@ services: depends_on: - piped healthcheck: - test: ash -c "wget --no-verbose --tries=1 --spider 127.0.0.1:80/feed || - (varnishreload && exit 1)" + test: ash -c "wget --no-verbose --tries=1 --spider 127.0.0.1:80/feed || (varnishreload && exit 1)" interval: 10s timeout: 10s retries: 1 diff --git a/template/docker-compose.nginx.yml b/template/docker-compose.nginx.yml index 1de3039..474fd4c 100644 --- a/template/docker-compose.nginx.yml +++ b/template/docker-compose.nginx.yml @@ -1,3 +1,5 @@ +version: "3" + services: pipedfrontend: image: 1337kavin/piped-frontend:latest @@ -5,9 +7,7 @@ services: depends_on: - piped container_name: piped-frontend - entrypoint: ash -c 'sed -i s/pipedapi.kavin.rocks/BACKEND_HOSTNAME/g - /usr/share/nginx/html/assets/* && /docker-entrypoint.sh && nginx -g - "daemon off;"' + entrypoint: ash -c 'sed -i s/pipedapi.kavin.rocks/BACKEND_HOSTNAME/g /usr/share/nginx/html/assets/* && /docker-entrypoint.sh && nginx -g "daemon off;"' ytproxy: image: 1337kavin/ytproxy:latest restart: unless-stopped @@ -31,8 +31,7 @@ services: depends_on: - piped healthcheck: - test: ash -c "wget --no-verbose --tries=1 --spider 127.0.0.1:80/feed || - (varnishreload && exit 1)" + test: ash -c "wget --no-verbose --tries=1 --spider 127.0.0.1:80/feed || (varnishreload && exit 1)" interval: 10s timeout: 10s retries: 1