diff --git a/docker/coolify-helper/Dockerfile b/docker/coolify-helper/Dockerfile index 741fff764..acc44d02a 100644 --- a/docker/coolify-helper/Dockerfile +++ b/docker/coolify-helper/Dockerfile @@ -1,19 +1,19 @@ # Versions # https://hub.docker.com/_/alpine -ARG BASE_IMAGE=alpine:3.20 +ARG BASE_IMAGE=alpine:3.21 # https://download.docker.com/linux/static/stable/ -ARG DOCKER_VERSION=27.3.1 +ARG DOCKER_VERSION=27.4.1 # https://github.com/docker/compose/releases -ARG DOCKER_COMPOSE_VERSION=2.30.3 +ARG DOCKER_COMPOSE_VERSION=2.32.2 # https://github.com/docker/buildx/releases -ARG DOCKER_BUILDX_VERSION=0.18.0 +ARG DOCKER_BUILDX_VERSION=0.19.3 # https://github.com/buildpacks/pack/releases -ARG PACK_VERSION=0.35.1 +ARG PACK_VERSION=0.36.2 # https://github.com/railwayapp/nixpacks/releases -ARG NIXPACKS_VERSION=1.29.0 -# https://hub.docker.com/r/minio/mc/tags -ARG MINIO_VERSION=RELEASE.2024-03-07T00-31-49Z +ARG NIXPACKS_VERSION=1.30.0 +# https://github.com/minio/mc/releases +ARG MINIO_VERSION=RELEASE.2024-11-21T17-21-54Z FROM minio/mc:${MINIO_VERSION} AS minio-client diff --git a/docker/coolify-realtime/Dockerfile b/docker/coolify-realtime/Dockerfile index b9f3c1e62..be72bd836 100644 --- a/docker/coolify-realtime/Dockerfile +++ b/docker/coolify-realtime/Dockerfile @@ -1,9 +1,13 @@ -FROM quay.io/soketi/soketi:1.6-16-alpine +# Versions +# https://github.com/soketi/soketi/releases +ARG SOKETI_VERSION=1.6-16-alpine +# https://github.com/cloudflare/cloudflared/releases +ARG CLOUDFLARED_VERSION=2025.1.0 +FROM quay.io/soketi/soketi:${SOKETI_VERSION} ARG TARGETPLATFORM -# https://github.com/cloudflare/cloudflared/releases -ARG CLOUDFLARED_VERSION=2024.4.1 +ARG CLOUDFLARED_VERSION WORKDIR /terminal RUN apk add --no-cache openssh-client make g++ python3 curl @@ -13,14 +17,12 @@ RUN npm rebuild node-pty --update-binary COPY docker/coolify-realtime/soketi-entrypoint.sh /soketi-entrypoint.sh COPY docker/coolify-realtime/terminal-server.js /terminal/terminal-server.js -RUN /bin/sh -c "if [[ ${TARGETPLATFORM} == 'linux/amd64' ]]; then \ - echo 'amd64' && \ - curl -sSL https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-amd64 -o /usr/local/bin/cloudflared && chmod +x /usr/local/bin/cloudflared \ - ;fi" - -RUN /bin/sh -c "if [[ ${TARGETPLATFORM} == 'linux/arm64' ]]; then \ - echo 'arm64' && \ - curl -L https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-arm64 -o /usr/local/bin/cloudflared && chmod +x /usr/local/bin/cloudflared \ - ;fi" +# Install Cloudflared based on architecture +RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \ + curl -sSL "https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-amd64" -o /usr/local/bin/cloudflared; \ + elif [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \ + curl -sSL "https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-arm64" -o /usr/local/bin/cloudflared; \ + fi && \ + chmod +x /usr/local/bin/cloudflared ENTRYPOINT ["/bin/sh", "/soketi-entrypoint.sh"] diff --git a/docker/coolify-realtime/package-lock.json b/docker/coolify-realtime/package-lock.json index 9316442ae..37f0c73eb 100644 --- a/docker/coolify-realtime/package-lock.json +++ b/docker/coolify-realtime/package-lock.json @@ -7,9 +7,9 @@ "dependencies": { "@xterm/addon-fit": "0.10.0", "@xterm/xterm": "5.5.0", - "axios": "1.7.7", - "cookie": "1.0.1", - "dotenv": "16.4.5", + "axios": "1.7.9", + "cookie": "1.0.2", + "dotenv": "16.4.7", "node-pty": "1.0.0", "ws": "8.18.0" } @@ -36,9 +36,9 @@ "license": "MIT" }, "node_modules/axios": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", - "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", @@ -59,9 +59,9 @@ } }, "node_modules/cookie": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.1.tgz", - "integrity": "sha512-Xd8lFX4LM9QEEwxQpF9J9NTUh8pmdJO0cyRJhFiDoLTk2eH8FXlRv2IFGYVadZpqI3j8fhNrSdKCeYPxiAhLXw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", "license": "MIT", "engines": { "node": ">=18" @@ -77,9 +77,9 @@ } }, "node_modules/dotenv": { - "version": "16.4.5", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", - "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "version": "16.4.7", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", + "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", "license": "BSD-2-Clause", "engines": { "node": ">=12" diff --git a/docker/coolify-realtime/package.json b/docker/coolify-realtime/package.json index 8b2076f8d..fbf2fcd34 100644 --- a/docker/coolify-realtime/package.json +++ b/docker/coolify-realtime/package.json @@ -4,9 +4,9 @@ "dependencies": { "@xterm/addon-fit": "0.10.0", "@xterm/xterm": "5.5.0", - "cookie": "1.0.1", - "axios": "1.7.7", - "dotenv": "16.4.5", + "cookie": "1.0.2", + "axios": "1.7.9", + "dotenv": "16.4.7", "node-pty": "1.0.0", "ws": "8.18.0" } diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 7d78e2854..95933c0c2 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -2,9 +2,9 @@ # https://hub.docker.com/r/serversideup/php/tags?name=8.4-fpm-nginx-alpine ARG SERVERSIDEUP_PHP_VERSION=8.4-fpm-nginx-alpine # https://github.com/minio/mc/releases -ARG MINIO_VERSION=RELEASE.2024-11-17T19-35-25Z +ARG MINIO_VERSION=RELEASE.2024-11-21T17-21-54Z # https://github.com/cloudflare/cloudflared/releases -ARG CLOUDFLARED_VERSION=2024.11.1 +ARG CLOUDFLARED_VERSION=2025.1.0 # https://www.postgresql.org/support/versioning/ ARG POSTGRES_VERSION=15 diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index 09281a666..fcaa906a6 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -2,9 +2,9 @@ # https://hub.docker.com/r/serversideup/php/tags?name=8.4-fpm-nginx-alpine ARG SERVERSIDEUP_PHP_VERSION=8.4-fpm-nginx-alpine # https://github.com/minio/mc/releases -ARG MINIO_VERSION=RELEASE.2024-11-17T19-35-25Z +ARG MINIO_VERSION=RELEASE.2024-11-21T17-21-54Z # https://github.com/cloudflare/cloudflared/releases -ARG CLOUDFLARED_VERSION=2024.11.1 +ARG CLOUDFLARED_VERSION=2025.1.0 # https://www.postgresql.org/support/versioning/ ARG POSTGRES_VERSION=15 diff --git a/docker/testing-host/Dockerfile b/docker/testing-host/Dockerfile index d98fcc821..4b424279d 100644 --- a/docker/testing-host/Dockerfile +++ b/docker/testing-host/Dockerfile @@ -1,10 +1,10 @@ # Versions # https://download.docker.com/linux/static/stable/ -ARG DOCKER_VERSION=27.3.1 +ARG DOCKER_VERSION=27.4.1 # https://github.com/docker/compose/releases -ARG DOCKER_COMPOSE_VERSION=2.30.3 +ARG DOCKER_COMPOSE_VERSION=2.32.2 # https://github.com/docker/buildx/releases -ARG DOCKER_BUILDX_VERSION=0.18.0 +ARG DOCKER_BUILDX_VERSION=0.19.3 FROM debian:12-slim