Skip to content

Dockerfile changes + build fix #580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidnewhall merged 2 commits into from
Feb 17, 2026
Merged

Dockerfile changes + build fix #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d60ba87
dockerfile changes
davidnewhall Feb 17, 2026
8de5058
fix file name
davidnewhall Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,11 +266,11 @@ unpackerr-$(VERSION)-$(ITERATION)-aarch64.pkg.tar.zst: package_build_linux_aarch
unpackerr-$(VERSION)-$(ITERATION)-aarch64.pkg.tar.zst.sig: unpackerr-$(VERSION)-$(ITERATION)-aarch64.pkg.tar.zst
[ "$(SIGNING_KEY)" = "" ] || gpg --local-user "$(SIGNING_KEY)" --output $@ --detach-sig $<

zstarmhf: unpackerr-$(VERSION)-$(ITERATION)-armhf.pkg.tar.zst unpackerr-$(VERSION)-$(ITERATION)-armhf.pkg.tar.zst.sig
unpackerr-$(VERSION)-$(ITERATION)-armhf.pkg.tar.zst: package_build_linux_armhf_zst check_fpm
zstarmhf: unpackerr-$(VERSION)-$(ITERATION)-arm7hf.pkg.tar.zst unpackerr-$(VERSION)-$(ITERATION)-arm7hf.pkg.tar.zst.sig
unpackerr-$(VERSION)-$(ITERATION)-arm7hf.pkg.tar.zst: package_build_linux_armhf_zst check_fpm
@echo "Building 32-bit ARM6/7 HF 'pacman' package for unpackerr version '$(VERSION)-$(ITERATION)'."
fpm -s dir -t pacman $(PACKAGE_ARGS) -a armhf -v $(VERSION) -C $< $(EXTRA_FPM_FLAGS)
unpackerr-$(VERSION)-$(ITERATION)-armhf.pkg.tar.zst.sig: unpackerr-$(VERSION)-$(ITERATION)-armhf.pkg.tar.zst
unpackerr-$(VERSION)-$(ITERATION)-arm7hf.pkg.tar.zst.sig: unpackerr-$(VERSION)-$(ITERATION)-arm7hf.pkg.tar.zst
[ "$(SIGNING_KEY)" = "" ] || gpg --local-user "$(SIGNING_KEY)" --output $@ --detach-sig $<

# Build an environment that can be packaged for linux.
Expand Down
22 changes: 9 additions & 13 deletions init/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
#
# This is part of Application Builder.
# https://github.com/golift/application-builder
#

FROM golang:1-alpine AS builder

WORKDIR /src
Expand All @@ -12,17 +7,19 @@ COPY pkg pkg
COPY examples examples
RUN go generate ./...

RUN apk add --no-cache tzdata openssl

ARG TARGETOS
ARG TARGETARCH
ARG BUILD_DATE
ARG BRANCH
ARG VERSION
ARG ITERATION
ARG COMMIT

RUN GOFLAGS="-trimpath -mod=readonly -modcacherw" \
GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /tmp/image -tags osusergo,netgo \
ENV GOFLAGS="-trimpath -mod=readonly -modcacherw"
ENV GOOS=${TARGETOS}
ENV GOARCH=${TARGETARCH}

RUN go build -o /tmp/unpackerr -tags osusergo,netgo \
-ldflags "-w -s -X \"golift.io/version.Branch=${BRANCH} (${COMMIT})\" \
-X \"golift.io/version.BuildDate=${BUILD_DATE}\" \
-X \"golift.io/version.BuildUser=docker\" \
Expand All @@ -45,7 +42,7 @@ ARG AUTHOR=golift
# Build-time metadata as defined at https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL org.opencontainers.image.created="${BUILD_DATE}" \
org.opencontainers.image.title="Unpackerr" \
org.opencontainers.image.documentation="${SOURCE_URL}/wiki/Docker" \
org.opencontainers.image.documentation="https://unpackerr.zip" \
org.opencontainers.image.description="${DESC}" \
org.opencontainers.image.url="${SOURCE_URL}" \
org.opencontainers.image.revision="${COMMIT}" \
Expand All @@ -56,10 +53,9 @@ LABEL org.opencontainers.image.created="${BUILD_DATE}" \
org.opencontainers.image.licenses="${LICENSE}" \
org.opencontainers.image.version="${VERSION}-${ITERATION}"

COPY --from=builder /tmp/image /unpackerr
COPY --from=builder /tmp/unpackerr /unpackerr
# Make sure we have an ssl cert chain and timezone data.
COPY --from=builder /etc/ssl /etc/ssl
COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
RUN apk add --no-cache openssl tzdata

ENV TZ=UTC

Expand Down