summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Dockerfile4
-rw-r--r--android/docker/Dockerfile4
-rw-r--r--wireguard/libwg/Dockerfile_AndroidPatchedGoruntime4
3 files changed, 6 insertions, 6 deletions
diff --git a/Dockerfile b/Dockerfile
index a1b59c8ffe..10eb78eaad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,9 +14,9 @@ RUN apt update -y && apt install build-essential \
# Install golang
-ENV GOLANG_VERSION 1.16
+ENV GOLANG_VERSION 1.18.1
# Checksum from: https://go.dev/dl/
-ENV GOLANG_HASH 013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2
+ENV GOLANG_HASH b3b815f47ababac13810fc6021eb73d65478e0b2db4b09d348eefad9581a2334
RUN curl -Lo go.tgz https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz && \
echo $(sha256sum go.tgz) && \
echo "${GOLANG_HASH} go.tgz" | sha256sum -c - && \
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile
index fe897fbf94..c70589f4b8 100644
--- a/android/docker/Dockerfile
+++ b/android/docker/Dockerfile
@@ -44,9 +44,9 @@ ENV ANDROID_NDK_HOME="/opt/android/android-ndk-r20b" \
NDK_TOOLCHAIN_DIR="/opt/android/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin"
# Install golang
-ENV GOLANG_VERSION 1.16
+ENV GOLANG_VERSION 1.18.1
# Checksum from: https://go.dev/dl/
-ENV GOLANG_HASH 013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2
+ENV GOLANG_HASH b3b815f47ababac13810fc6021eb73d65478e0b2db4b09d348eefad9581a2334
COPY goruntime-boottime-over-monotonic.diff /tmp/goruntime-boottime-over-monotonic.diff
RUN cd /tmp && \
curl -sf -L -o go.tgz https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz && \
diff --git a/wireguard/libwg/Dockerfile_AndroidPatchedGoruntime b/wireguard/libwg/Dockerfile_AndroidPatchedGoruntime
index 792af9427d..09104e7e6d 100644
--- a/wireguard/libwg/Dockerfile_AndroidPatchedGoruntime
+++ b/wireguard/libwg/Dockerfile_AndroidPatchedGoruntime
@@ -27,8 +27,8 @@ RUN cd /tmp && \
ENV ANDROID_NDK_HOME="/opt/android/android-ndk-r20b"
ENV NDK_TOOLCHAIN_DIR="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin"
-ENV GOLANG_VERSION 1.16
-ENV GOLANG_HASH 013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2
+ENV GOLANG_VERSION 1.18.1
+ENV GOLANG_HASH b3b815f47ababac13810fc6021eb73d65478e0b2db4b09d348eefad9581a2334
# Install Go-lang and patch it to use the appropriate monotonic clock
COPY goruntime-boottime-over-monotonic.diff /opt/goruntime-boottime-over-monotonic.diff