From a27efd9d471d0574d4cc3243e2a5f5c38e94c8a5 Mon Sep 17 00:00:00 2001 From: rsteube Date: Tue, 3 Sep 2024 19:59:13 +0200 Subject: [PATCH 1/2] update to 1.23.0 --- .gitmodules | 2 +- Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index fb08bcf..ee8a1b0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "go-src"] path = go-src url = https://github.com/golang/go - branch = release-branch.go1.22.2 + branch = release-branch.go1.23.0 diff --git a/Dockerfile b/Dockerfile index dc9e5e7..9c1e063 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -FROM golang:1.22.1 as build +FROM golang:1.23.0 as build COPY . /go-src RUN cd /go-src && make build -FROM golang:1.22.1 as build-termux +FROM golang:1.23.0 as build-termux COPY . /go-src RUN cd /go-src && make build-termux -FROM golang:1.22.1 +FROM golang:1.23.0 COPY --from=build /usr/local/go/ /usr/local/go COPY --from=build-termux /usr/local/go/ /usr/local/go-termux/ From 880f21d10d229298fb785b6a9d1ab2025d3f813c Mon Sep 17 00:00:00 2001 From: rsteube Date: Tue, 3 Sep 2024 20:18:23 +0200 Subject: [PATCH 2/2] fix warnings --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9c1e063..23b563b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM golang:1.23.0 as build +FROM golang:1.23.0 AS build COPY . /go-src RUN cd /go-src && make build -FROM golang:1.23.0 as build-termux +FROM golang:1.23.0 AS build-termux COPY . /go-src RUN cd /go-src && make build-termux @@ -11,7 +11,7 @@ COPY --from=build /usr/local/go/ /usr/local/go COPY --from=build-termux /usr/local/go/ /usr/local/go-termux/ RUN apt-get update && apt-get install -y sdkmanager -ENV NDK_VERSION r26d -ENV ANDROID_VERSION 34 +ENV NDK_VERSION=r26d +ENV ANDROID_VERSION=34 RUN sdkmanager --install "ndk;${NDK_VERSION}" COPY go-termux.sh /usr/local/bin/go-termux