diff --git a/Caddy.Dockerfile b/Caddy.Dockerfile index ed7931b8..4c2ccb65 100644 --- a/Caddy.Dockerfile +++ b/Caddy.Dockerfile @@ -1,6 +1,6 @@ FROM caddy:2.7.6 as caddy -FROM alpine:3.19.1 +FROM alpine:3.20.0 RUN apk add --no-cache ca-certificates tzdata COPY --from=caddy /usr/bin/caddy /usr/bin/caddy COPY Caddyfile /etc/caddy/Caddyfile diff --git a/Dockerfile b/Dockerfile index 92dc37ed..ca1fb7c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,14 @@ # syntax=docker/dockerfile:labs -FROM --platform="$BUILDPLATFORM" alpine:3.19.1 as frontend +FROM --platform="$BUILDPLATFORM" alpine:3.20.0 as frontend COPY frontend /build/frontend COPY global/certbot-dns-plugins.json /build/frontend/certbot-dns-plugins.json ARG NODE_ENV=production \ NODE_OPTIONS=--openssl-legacy-provider WORKDIR /build/frontend RUN apk upgrade --no-cache -a && \ - apk add --no-cache ca-certificates nodejs yarn git python3 build-base && \ + apk add --no-cache ca-certificates nodejs yarn git python3 py3-pip build-base && \ yarn global add clean-modules && \ + pip install setuptools --no-cache-dir --break-system-packages && \ yarn --no-lockfile install && \ clean-modules --yes && \ yarn --no-lockfile build && \ @@ -16,7 +17,7 @@ COPY darkmode.css /build/frontend/dist/css/darkmode.css COPY security.txt /build/frontend/dist/.well-known/security.txt -FROM --platform="$BUILDPLATFORM" alpine:3.19.1 as backend +FROM --platform="$BUILDPLATFORM" alpine:3.20.0 as backend SHELL ["/bin/ash", "-eo", "pipefail", "-c"] COPY backend /build/backend COPY global/certbot-dns-plugins.json /build/backend/certbot-dns-plugins.json @@ -35,7 +36,7 @@ RUN apk upgrade --no-cache -a && \ yarn cache clean --all -FROM --platform="$BUILDPLATFORM" alpine:3.19.1 as crowdsec +FROM --platform="$BUILDPLATFORM" alpine:3.20.0 as crowdsec SHELL ["/bin/ash", "-eo", "pipefail", "-c"] ARG CSNB_VER=v1.0.8 @@ -64,8 +65,8 @@ SHELL ["/bin/ash", "-eo", "pipefail", "-c"] ARG CRS_VER=v4.2.0 COPY rootfs / -COPY --from=zoeyvid/certbot-docker:34 /usr/local /usr/local -COPY --from=zoeyvid/curl-quic:384 /usr/local/bin/curl /usr/local/bin/curl +COPY --from=zoeyvid/certbot-docker:35 /usr/local /usr/local +COPY --from=zoeyvid/curl-quic:388 /usr/local/bin/curl /usr/local/bin/curl RUN apk upgrade --no-cache -a && \ apk add --no-cache ca-certificates tzdata tini \ diff --git a/backend/package.json b/backend/package.json index d6432736..86bfa717 100644 --- a/backend/package.json +++ b/backend/package.json @@ -4,7 +4,7 @@ "description": "A beautiful interface for creating Nginx endpoints", "main": "index.js", "dependencies": { - "@apidevtools/json-schema-ref-parser": "11.6.1", + "@apidevtools/json-schema-ref-parser": "11.6.2", "ajv": "6.12.6", "archiver": "7.0.1", "batchflow": "0.4.0", @@ -16,7 +16,7 @@ "gravatar": "1.8.2", "jsonwebtoken": "9.0.2", "knex": "3.1.0", - "liquidjs": "10.12.0", + "liquidjs": "10.13.0", "lodash": "4.17.21", "moment": "2.30.1", "mysql": "2.18.1", @@ -29,11 +29,11 @@ "author": "Jamie Curnow and ZoeyVid ", "license": "MIT", "devDependencies": { - "@eslint/js": "9.2.0", - "eslint": "9.2.0", + "@eslint/js": "9.3.0", + "eslint": "9.3.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.1.3", - "globals": "15.2.0", + "globals": "15.3.0", "prettier": "3.2.5" } }