PenaSide/verification
3
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'main'

Browse Source 
FIX: Dockerfile added copy for assets; shutdown

See merge request backend/verification!5
This commit is contained in:
Mikhail 2023-07-17 21:21:29 +00:00
commit 198e7b9a80
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Dockerfile
View File

@ -1,19 +1,20 @@
FROM golang:alpine as build
WORKDIR /app
ARG GITLAB_TOKEN
RUN apk add git
ENV GOPRIVATE=penahub.gitlab.yandexcloud.net/backend/penahub_common
RUN git config --global url."https://forgomod:${GITLAB_TOKEN}@penahub.gitlab.yandexcloud.net/".insteadOf "https://penahub.gitlab.yandexcloud.net/"
COPY . .
RUN go mod download
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o app ./cmd/verification/main.go
FROM alpine
EXPOSE 7035
COPY --from=build app/app .
COPY --from=build app/staging.env .
ENV DOMAIN=tempgen.pena.digital
ENV YADISK_CLIENT_ID=1ed4b85c1a5c4e6abf783d3ea28fd947
ENV YADISK_CLIENT_SECRET=e1d4f385c1274dccb7d29646b802d607
RUN apk add --no-cache ca-certificates
CMD ["/app"]
FROM golang:alpine as build
WORKDIR /app
ARG GITLAB_TOKEN
RUN apk add git
ENV GOPRIVATE=penahub.gitlab.yandexcloud.net/backend/penahub_common
RUN git config --global url."https://forgomod:${GITLAB_TOKEN}@penahub.gitlab.yandexcloud.net/".insteadOf "https://penahub.gitlab.yandexcloud.net/"
COPY . .
RUN go mod download
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o app ./cmd/verification/main.go
FROM alpine
EXPOSE 7035
COPY --from=build app/app .
COPY --from=build app/staging.env .
COPY --from=build app/assets ./assets
ENV DOMAIN=tempgen.pena.digital
ENV YADISK_CLIENT_ID=1ed4b85c1a5c4e6abf783d3ea28fd947
ENV YADISK_CLIENT_SECRET=e1d4f385c1274dccb7d29646b802d607
RUN apk add --no-cache ca-certificates
CMD ["/app"]

2
internal/app/shutdown.go
View File

@ -26,7 +26,7 @@ func gracefulShutdown(ctx context.Context, logger *zap.Logger, httpSrv *server.H
}
if err := mongoClient.Disconnect(ctx); err != nil {
logger.Error("BoltDB", zap.Error(err))
logger.Error("MongoDB", zap.Error(err))
}
}