diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml index ef3aa79..5ace49f 100644 --- a/.forgejo/workflows/build-image.yml +++ b/.forgejo/workflows/build-image.yml @@ -21,7 +21,7 @@ jobs: - name: Detect Directory Changes id: changed-dirs - uses: https://gitea.angry.im/actions/changed-files@v42 + uses: https://github.com/tj-actions/changed-files@v42 with: dir_names: 'true' dir_names_max_depth: '1' diff --git a/element-web/Dockerfile b/element-web/Dockerfile index 7484576..6459f0c 100644 --- a/element-web/Dockerfile +++ b/element-web/Dockerfile @@ -1,4 +1,4 @@ -ARG ELEMENT_VER=v1.11.77 +ARG ELEMENT_VER=v1.11.58 FROM debian:11 AS builder diff --git a/headscale/Dockerfile b/headscale/Dockerfile index 1ab2c23..0744ee2 100644 --- a/headscale/Dockerfile +++ b/headscale/Dockerfile @@ -1,7 +1,7 @@ # Builder image -FROM docker.io/golang:1.24-bookworm AS build -ARG VERSION=v0.25.1 -ARG CADDY_VERSION=v2.10.0 +FROM docker.io/golang:1.20-bullseye AS build +ARG VERSION=v0.22.3 +ARG CADDY_VERSION=v2.7.6 ENV GOPATH /go RUN apt-get install -y git && \ @@ -26,8 +26,8 @@ RUN strip /go/bin/caddy RUN test -e /go/bin/caddy # Node build image -FROM docker.io/node:22-bookworm AS build-node -ARG UI_COMMIT=2025.03.21 +FROM docker.io/node:19-bullseye AS build-node +ARG UI_COMMIT=a9db179089e3ae2b417fb657a2d3da68a54b1f2d RUN apt-get install -y git && \ git clone https://github.com/gurucomputing/headscale-ui /headscale-ui @@ -39,7 +39,7 @@ RUN git checkout $UI_COMMIT && npm install --development && npm run build # Production image # Note that we do not use "distroless" because we actually want to have a shell in the image # to run app.sh (in order to perform custom initialization) -FROM docker.io/golang:1.24-bookworm +FROM docker.io/golang:1.20-bullseye COPY --from=build /go/bin/headscale /bin/headscale COPY --from=build /go/bin/caddy /bin/caddy diff --git a/nginx-dav-ext/Dockerfile b/nginx-dav-ext/Dockerfile deleted file mode 100644 index 3fe048f..0000000 --- a/nginx-dav-ext/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -ARG NGINX_VERSION=1.25.4 - -FROM docker.io/debian:bookworm AS builder - -ARG NGINX_VERSION - -RUN apt-get -y update && apt-get -y install git build-essential wget libxslt1-dev libpcre2-dev zlib1g-dev \ - && mkdir /src && cd /src \ - && wget -qO - https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz | tar zxfv - \ - && git clone https://github.com/arut/nginx-dav-ext-module.git \ - && git clone https://github.com/openresty/headers-more-nginx-module.git - -RUN cd /src/nginx-${NGINX_VERSION} && ./configure --with-compat \ - --with-file-aio --with-threads \ - --add-dynamic-module=../nginx-dav-ext-module \ - --add-dynamic-module=../headers-more-nginx-module \ - && make modules - -FROM docker.io/nginx:${NGINX_VERSION}-bookworm - -ARG NGINX_VERSION - -COPY --from=builder /src/nginx-${NGINX_VERSION}/objs/ngx_http_dav_ext_module.so /usr/lib/nginx/modules/ -COPY --from=builder /src/nginx-${NGINX_VERSION}/objs/ngx_http_headers_more_filter_module.so /usr/lib/nginx/modules/ diff --git a/standardnotes-web/Dockerfile b/standardnotes-web/Dockerfile index 034990d..3d439d8 100644 --- a/standardnotes-web/Dockerfile +++ b/standardnotes-web/Dockerfile @@ -1,6 +1,6 @@ FROM node:16-alpine AS builder -ARG SN_TAG=@standardnotes/web@3.195.6 +ARG SN_TAG=@standardnotes/web@3.173.23 RUN apk add git diff --git a/uptime-kuma-tailscale/Dockerfile b/uptime-kuma-tailscale/Dockerfile index 827891d..a6ddaf6 100644 --- a/uptime-kuma-tailscale/Dockerfile +++ b/uptime-kuma-tailscale/Dockerfile @@ -2,7 +2,7 @@ # Used on fly.io because it does not support sidecar containers # The tailscale ephemeral key should be provided via the env variable TAILSCALE_KEY # custom tailscale control plane can be specified with TAILSCALE_SERVER -FROM docker.io/louislam/uptime-kuma:1.23.16 +FROM docker.io/louislam/uptime-kuma:1.21.2 # Default tailscale login server ENV TAILSCALE_SERVER=https://controlplane.tailscale.com ENV TAILSCALE_HOSTNAME=uptime-kuma diff --git a/uptime-kuma-tailscale/run.sh b/uptime-kuma-tailscale/run.sh index c1f587e..5de8d4b 100644 --- a/uptime-kuma-tailscale/run.sh +++ b/uptime-kuma-tailscale/run.sh @@ -2,5 +2,5 @@ /usr/sbin/tailscaled -state=mem: & sleep 1 -tailscale up --login-server=$TAILSCALE_SERVER --authkey=$TAILSCALE_KEY --hostname=$TAILSCALE_HOSTNAME & +tailscale up --login-server=$TAILSCALE_SERVER --authkey=$TAILSCALE_KEY --hostname=$TAILSCALE_HOSTNAME node /app/server/server.js