From ab709c1bdb0838820bcc6f9e5e89b84dc3717bc5 Mon Sep 17 00:00:00 2001 From: tobi Date: Wed, 26 Feb 2025 20:37:05 +0100 Subject: [PATCH] [chore] Use vendored swagger in Docker container --- Dockerfile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7b7728a53..48324a45f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,19 +4,14 @@ # stage 1: generate up-to-date swagger.yaml to put in the final container FROM --platform=${BUILDPLATFORM} golang:1.23-alpine AS swagger -RUN \ - ### Installs goswagger for building swagger definitions inside this container - go install "github.com/go-swagger/go-swagger/cmd/swagger@c46c303aaa02" && \ - # Makes swagger executable - chmod +x /go/bin/swagger - COPY go.mod /go/src/github.com/superseriousbusiness/gotosocial/go.mod COPY go.sum /go/src/github.com/superseriousbusiness/gotosocial/go.sum COPY cmd /go/src/github.com/superseriousbusiness/gotosocial/cmd COPY internal /go/src/github.com/superseriousbusiness/gotosocial/internal +COPY vendor /go/src/github.com/superseriousbusiness/gotosocial/vendor WORKDIR /go/src/github.com/superseriousbusiness/gotosocial -RUN /go/bin/swagger generate spec -o /go/src/github.com/superseriousbusiness/gotosocial/swagger.yaml --scan-models +RUN ./vendor/github.com/go-swagger/go-swagger/cmd/swagger generate spec -o /go/src/github.com/superseriousbusiness/gotosocial/swagger.yaml --scan-models # stage 2: generate the web/assets/dist bundles FROM --platform=${BUILDPLATFORM} node:18-alpine AS bundler