mirror of
https://github.com/hay-kot/homebox.git
synced 2025-08-03 08:10:28 +00:00
fix: remove conflicts after merge
This commit is contained in:
parent
b82725f1f4
commit
1c870d80f9
1 changed files with 0 additions and 15 deletions
15
Dockerfile
15
Dockerfile
|
@ -35,21 +35,9 @@ FROM gcr.io/distroless/static
|
|||
ENV HBOX_MODE=production
|
||||
ENV HBOX_STORAGE_DATA=/data/
|
||||
ENV HBOX_STORAGE_SQLITE_URL=/data/homebox.db?_fk=1
|
||||
<<<<<<< HEAD
|
||||
|
||||
RUN apk --no-cache add ca-certificates
|
||||
RUN mkdir /app
|
||||
COPY --from=builder /go/bin/api /app
|
||||
|
||||
RUN chmod +x /app/api
|
||||
=======
|
||||
ENV USER=appuser
|
||||
ENV UID=1001
|
||||
ENV GID=1001
|
||||
|
||||
COPY --from=builder --chown=nonroot /go/bin/api /app/api
|
||||
COPY --from=builder --chown=nonroot /data /data
|
||||
>>>>>>> bc9d021... feat: use distroless image and non-root user
|
||||
|
||||
LABEL Name=homebox Version=0.0.1
|
||||
LABEL org.opencontainers.image.source="https://github.com/hay-kot/homebox"
|
||||
|
@ -57,9 +45,6 @@ EXPOSE 7745
|
|||
WORKDIR /app
|
||||
VOLUME [ "/data" ]
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
USER nonroot
|
||||
>>>>>>> bc9d021... feat: use distroless image and non-root user
|
||||
ENTRYPOINT [ "/app/api" ]
|
||||
CMD [ "/data/config.yml" ]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue