diff --git a/.version b/.version index ea55a03f..edcfe40d 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.13.7 +2.14.0 diff --git a/README.md b/README.md index e6f7c056..ae162fbc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@



- + @@ -36,6 +36,10 @@ so that the barrier for entry here is low. - Advanced Nginx configuration available for super users - User management, permissions and audit log +::: warning +`armv7` is no longer supported in version 2.14+. This is due to Nodejs dropping support for armhf. Please +use the `2.13.7` image tag if this applies to you. +::: ## Hosting your home network @@ -43,16 +47,15 @@ I won't go in to too much detail here but here are the basics for someone new to 1. Your home router will have a Port Forwarding section somewhere. Log in and find it 2. Add port forwarding for port 80 and 443 to the server hosting this project -3. Configure your domain name details to point to your home, either with a static ip or a service like DuckDNS or [Amazon Route53](https://github.com/jc21/route53-ddns) +3. Configure your domain name details to point to your home, either with a static ip or a service like + - DuckDNS + - [Amazon Route53](https://github.com/jc21/route53-ddns) + - [Cloudflare](https://github.com/jc21/cloudflare-ddns) 4. Use the Nginx Proxy Manager as your gateway to forward to your other web based services ## Quick Setup -1. Install Docker and Docker-Compose - -- [Docker Install documentation](https://docs.docker.com/install/) -- [Docker-Compose Install documentation](https://docs.docker.com/compose/install/) - +1. [Install Docker](https://docs.docker.com/install/) 2. Create a docker-compose.yml file similar to this: ```yml diff --git a/docker/scripts/install-s6 b/docker/scripts/install-s6 index 639c65dd..5fcb4e09 100755 --- a/docker/scripts/install-s6 +++ b/docker/scripts/install-s6 @@ -17,10 +17,6 @@ case $TARGETPLATFORM in S6_ARCH=aarch64 ;; - linux/arm/v7) - S6_ARCH=armhf - ;; - *) S6_ARCH=x86_64 ;; diff --git a/docs/src/setup/index.md b/docs/src/setup/index.md index b6702cec..49b9e618 100644 --- a/docs/src/setup/index.md +++ b/docs/src/setup/index.md @@ -169,12 +169,10 @@ Custom Postgres schema is not supported, as such `public` will be used. The docker images support the following architectures: - amd64 - arm64 -- armv7 ::: warning - -`armv7` support will be retired after June 2026. Any new versions released after this time will only support `amd64` amd `arm64`. - +`armv7` is no longer supported in version 2.14+. This is due to Nodejs dropping support for armhf. Please +use the `2.13.7` image tag if this applies to you. ::: The docker images are a manifest of all the architecture docker builds supported, so this means diff --git a/scripts/buildx b/scripts/buildx index 5ad77ed9..8838290a 100755 --- a/scripts/buildx +++ b/scripts/buildx @@ -22,7 +22,7 @@ docker buildx build \ --build-arg BUILD_DATE="$(date '+%Y-%m-%d %T %Z')" \ --build-arg GOPROXY="${GOPROXY:-}" \ --build-arg GOPRIVATE="${GOPRIVATE:-}" \ - --platform linux/amd64,linux/arm64,linux/arm/7 \ + --platform linux/amd64,linux/arm64 \ --progress plain \ --pull \ -f docker/Dockerfile \