From 28f068c8907c9f03e0b7043189e252b004ce3a38 Mon Sep 17 00:00:00 2001 From: Florian Hoss Date: Tue, 4 Jul 2023 23:09:41 +0200 Subject: [PATCH] Fix build process --- docker/Dockerfile | 4 ++-- scripts/entrypoint.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 830235b..84f89ab 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ RUN go mod download COPY . . RUN ./swagger.sh init -RUN go build -ldflags="-s -w" +RUN go build -ldflags="-s -w" cmd/cafe-plaetschwiesle/cafe-plaetschwiesle.go FROM node:${NODE_VERSION}-alpine AS nodeBuilder WORKDIR /app @@ -40,7 +40,7 @@ COPY ./scripts/entrypoint.sh . COPY --from=logo /logo.txt . COPY --from=nodeBuilder /app/dist/ ./templates/ -COPY --from=goBuilder /app/cafe . +COPY --from=goBuilder /app/cafe-plaetschwiesle . COPY config.toml . ARG VERSION diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh index ba129be..ed6b9f1 100755 --- a/scripts/entrypoint.sh +++ b/scripts/entrypoint.sh @@ -27,8 +27,8 @@ if [ -n "$PUID" ] || [ -n "$PGID" ]; then chown "$USER":"$USER" "$HOME" -R printf "UID: %s GID: %s\n\n" "$PUID" "$PGID" - exec su -c - $USER ./cafe + exec su -c - $USER ./cafe-plaetschwiesle else printf "WARNING: Running docker as root\n\n" - exec ./cafe + exec ./cafe-plaetschwiesle fi