Merge branch 'main' into ada/fix-linter

This commit is contained in:
Hacki 2024-05-10 23:08:19 +00:00 committed by Hacki
commit eb0d52d70a
4 changed files with 9 additions and 9 deletions

View file

@ -3,7 +3,7 @@ steps:
image: woodpeckerci/plugin-docker-buildx image: woodpeckerci/plugin-docker-buildx
settings: settings:
repo: git.gnous.eu/${CI_REPO_OWNER}/plakken repo: git.gnous.eu/${CI_REPO_OWNER}/plakken
dockerfile: docker/Dockerfile dockerfile: deployement/docker/Dockerfile
platforms: linux/amd64,linux/arm64/v8,linux/arm platforms: linux/amd64,linux/arm64/v8,linux/arm
registry: https://git.gnous.eu registry: https://git.gnous.eu
tag: ${CI_COMMIT} tag: ${CI_COMMIT}
@ -18,7 +18,7 @@ steps:
image: woodpeckerci/plugin-docker-buildx image: woodpeckerci/plugin-docker-buildx
settings: settings:
repo: git.gnous.eu/${CI_REPO_OWNER}/plakken repo: git.gnous.eu/${CI_REPO_OWNER}/plakken
dockerfile: docker/Dockerfile dockerfile: deployement/docker/Dockerfile
platforms: linux/amd64,linux/arm64/v8,linux/arm platforms: linux/amd64,linux/arm64/v8,linux/arm
registry: https://git.gnous.eu registry: https://git.gnous.eu
tags: tags:

View file

@ -1,18 +1,18 @@
# Build # Build
FROM golang:1.22 AS build FROM golang:1.22 AS build
LABEL authors="gnousEU"
WORKDIR /build WORKDIR /build
COPY go.mod go.sum ./ COPY go.mod go.sum ./
RUN go mod download RUN go mod download
COPY main.go ./
COPY internal/ ./internal
COPY static/ ./static COPY static/ ./static
COPY templates/ ./templates COPY templates/ ./templates
COPY main.go ./
COPY internal/ ./internal
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags "-w -s" # Enable static binary, target Linux, remove debug information and strip binary # Enable static binary, target Linux, remove debug information and strip binary
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags "-w -s"
# Copy to our image # Copy to our image
FROM gcr.io/distroless/static-debian12:nonroot FROM gcr.io/distroless/static-debian12:nonroot