From 8ae861557220399bda79c316496d90e93df5919d Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Thu, 27 Jun 2024 16:25:09 +0200 Subject: [PATCH] Bump Go to 1.22 with latest trac2gitea code Signed-off-by: Benoit Donneaux --- docker/go/Dockerfile | 22 ++++++++-------------- trac2gitea | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/docker/go/Dockerfile b/docker/go/Dockerfile index ef7e057..43440c9 100644 --- a/docker/go/Dockerfile +++ b/docker/go/Dockerfile @@ -1,9 +1,9 @@ # Start from the official Go image based on Alpine -FROM golang:1.19.3-alpine +FROM golang:1.22.4-alpine LABEL Description="Trac2Gitea migration tool" -RUN apk --no-cache add gcc libc-dev make +RUN apk --no-cache add gcc git libc-dev make # Parameters for default user:group ARG uid=1000 @@ -23,18 +23,12 @@ RUN DIRS="/src /app" && \ # Switch to non-root user USER ${user} -# Inject the source code -#COPY *.go go.* accessor/* importer log markdown /src/ +# Install mockgen +#RUN go install go.uber.org/mock/mockgen@v0.4.0 +#RUN ln -s /go /home/${user}/go -# Download deps, build the app and cleanup the source -WORKDIR /src +# Install pinned dependencies +#COPY go.mod go.sum /src +#WORKDIR /src #RUN go mod download && \ # go mod verify - -#RUN go build -o /app/trac2gitea -ldflags '-extldflags "-static"' -buildvcs=false -v - -# Switch to app directory -#WORKDIR /app - -# Run the app by default -#CMD ./trac2gitea diff --git a/trac2gitea b/trac2gitea index d004494..f013209 160000 --- a/trac2gitea +++ b/trac2gitea @@ -1 +1 @@ -Subproject commit d004494696af004da69614335f09848abeb54244 +Subproject commit f013209fe7461359865579a28a161bb74c3abf37