From 7d53b03a3910b6977d8db8f25501adad434292ad Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sat, 18 Feb 2023 14:22:06 -0500 Subject: [PATCH 1/3] uprev element-web and use fully qualified container name --- element-web/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/element-web/Dockerfile b/element-web/Dockerfile index 14f47b6..37bf42e 100644 --- a/element-web/Dockerfile +++ b/element-web/Dockerfile @@ -1,4 +1,4 @@ -ARG ELEMENT_VER=v1.11.16-rc.2 +ARG ELEMENT_VER=v1.11.23 FROM debian:11 AS builder @@ -12,7 +12,7 @@ RUN cd / && curl -k -L "https://raw.githubusercontent.com/vector-im/element-web/ && git clone --depth=1 https://github.com/aaronraimist/element-themes \ && node custom_config.js | tee config.json -FROM vectorim/element-web:${ELEMENT_VER} +FROM docker.io/vectorim/element-web:${ELEMENT_VER} ARG ELEMENT_VER From b8cae98842e02f129f75d11f84584a7f52efcb84 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sat, 18 Feb 2023 14:28:21 -0500 Subject: [PATCH 2/3] Retry push until success --- build-image.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-image.sh b/build-image.sh index 26b081e..065257d 100755 --- a/build-image.sh +++ b/build-image.sh @@ -6,3 +6,7 @@ set -e docker build $1 -t gitea.angry.im/petercxy/$1:latest docker push gitea.angry.im/petercxy/$1:latest + +while ! [ "$?" -eq 0 ]; do + docker push gitea.angry.im/petercxy/$1:latest +done From 03215de6c43d8a1fb5d0eec7113b95d5d222e2d6 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sat, 18 Feb 2023 14:32:52 -0500 Subject: [PATCH 3/3] headscale: uprev to 0.20.0 --- headscale/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/headscale/Dockerfile b/headscale/Dockerfile index 43d559c..d8ca576 100644 --- a/headscale/Dockerfile +++ b/headscale/Dockerfile @@ -1,6 +1,6 @@ # Builder image -FROM docker.io/golang:1.19.0-bullseye AS build -ARG VERSION=v0.17.1 +FROM docker.io/golang:1.19.3-bullseye AS build +ARG VERSION=v0.20.0 ENV GOPATH /go RUN apt-get install -y git && \ @@ -17,7 +17,7 @@ RUN test -e /go/bin/headscale # 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.19.0-bullseye +FROM docker.io/golang:1.19.3-bullseye COPY --from=build /go/bin/headscale /bin/headscale ENV TZ UTC