flohoss/cafe-plaetschwiesle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build process

Browse source
This commit is contained in:
Florian Hoss 2023-07-04 23:09:41 +02:00
parent 16b2f17301
commit 28f068c890
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docker/Dockerfile
View file

@ -14,7 +14,7 @@ RUN go mod download
COPY . . COPY . .
RUN ./swagger.sh init 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 FROM node:${NODE_VERSION}-alpine AS nodeBuilder
WORKDIR /app WORKDIR /app
@ -40,7 +40,7 @@ COPY ./scripts/entrypoint.sh .
COPY --from=logo /logo.txt . COPY --from=logo /logo.txt .
COPY --from=nodeBuilder /app/dist/ ./templates/ COPY --from=nodeBuilder /app/dist/ ./templates/
COPY --from=goBuilder /app/cafe . COPY --from=goBuilder /app/cafe-plaetschwiesle .
COPY config.toml . COPY config.toml .
ARG VERSION ARG VERSION

4
scripts/entrypoint.sh
View file

@ -27,8 +27,8 @@ if [ -n "$PUID" ] || [ -n "$PGID" ]; then
chown "$USER":"$USER" "$HOME" -R chown "$USER":"$USER" "$HOME" -R
printf "UID: %s GID: %s\n\n" "$PUID" "$PGID" printf "UID: %s GID: %s\n\n" "$PUID" "$PGID"
exec su -c - $USER ./cafe exec su -c - $USER ./cafe-plaetschwiesle
else else
printf "WARNING: Running docker as root\n\n" printf "WARNING: Running docker as root\n\n"
exec ./cafe exec ./cafe-plaetschwiesle
fi fi