A continuation of HomeBox the inventory and organization system built for the Home User
Update WGET from Busybox to APK
Katos69e5a877c0d3
diff --git a/Dockerfile b/Dockerfileindex 3b448c5e..c16cc3f4 100644--- a/Dockerfile+++ b/Dockerfile@@ -13,7 +13,6 @@ FROM golang:alpine AS builderARG BUILD_TIMEARG COMMITARG VERSION-ARG BUSYBOX_VERSION=1.36.1-r31RUN apk update && \apk upgrade && \apk add --update git build-base gcc g++@@ -28,14 +27,8 @@ RUN CGO_ENABLED=0 GOOS=linux go build \-o /go/bin/api \-v ./app/api/*.go-# Downloading Wget-ADD https://busybox.net/downloads/binaries/$BUSYBOX_VERSION/busybox_WGET /wget-RUN chmod a+x /wget-FROM gcr.io/distroless/java:latest-COPY --from=builder /wget /usr/bin/wget-# Production StageFROM alpine:latest@@ -46,9 +39,9 @@ ENV HBOX_STORAGE_SQLITE_URL=/data/homebox.db?_pragma=busy_timeout=2000&_pragma=jRUN apk --no-cache add ca-certificatesRUN mkdir /appCOPY --from=builder /go/bin/api /app-COPY --from=builder /wget /usr/bin/wgetRUN chmod +x /app/api+RUN apk add --no-cache wgetLABEL Name=homebox Version=0.0.1LABEL org.opencontainers.image.source="https://github.com/sysadminsmedia/homebox"diff --git a/Dockerfile.rootless b/Dockerfile.rootlessindex c48c6f47..51af4d64 100644--- a/Dockerfile.rootless+++ b/Dockerfile.rootless@@ -31,14 +31,8 @@ RUN CGO_ENABLED=0 GOOS=linux go build \# create a directory so that we can copy it in the next stagemkdir /data-# Downloading Wget-ADD https://busybox.net/downloads/binaries/$BUSYBOX_VERSION/busybox_WGET /wget-RUN chmod a+x /wget-FROM gcr.io/distroless/java:latest-COPY --from=builder /wget /usr/bin/wget-# Production StageFROM gcr.io/distroless/static:latest@@ -50,7 +44,8 @@ ENV HBOX_STORAGE_SQLITE_URL=/data/homebox.db?_fk=1# change the ownership to the low-privileged userCOPY --from=builder --chown=nonroot /go/bin/api /appCOPY --from=builder --chown=nonroot /data /data-COPY --from=builder --chown=nonroot /wget /usr/bin/wget++RUN apk add --no-cache wgetLABEL Name=homebox Version=0.0.1LABEL org.opencontainers.image.source="https://github.com/sysadminsmedia/homebox"