linux: Build amd64 and arm64 podman-remote-static binaries

Looking at https://github.com/containers/podman/releases/tag/v4.3.1,
it's not explicit which arch the podman-remote-static binary is built
for, so this commit adds an -$(goarch) suffix to it. It builds both
arm64 and amd64 binaries as I need both for crc.

Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
Christophe Fergeau 2022-11-29 10:33:59 +01:00
parent c49de2210c
commit d223950078
4 changed files with 14 additions and 10 deletions

View File

@ -335,10 +335,10 @@ $(SRCBINDIR)/podman$(BINSFX): $(SOURCES) go.mod go.sum | $(SRCBINDIR)
-tags "${REMOTETAGS}" \
-o $@ ./cmd/podman
$(SRCBINDIR)/podman-remote-static: $(SRCBINDIR) $(SOURCES) go.mod go.sum
$(SRCBINDIR)/podman-remote-static_amd64 $(SRCBINDIR)/podman-remote-static_arm64: $(SRCBINDIR)/podman-remote-static_%: $(SRCBINDIR) $(SOURCES) go.mod go.sum
CGO_ENABLED=0 \
GOOS=linux \
GOARCH=$(GOARCH) \
GOARCH=$* \
$(GO) build \
$(BUILDFLAGS) \
$(GO_LDFLAGS) '$(LDFLAGS_PODMAN_STATIC)' \
@ -362,8 +362,9 @@ $(SRCBINDIR)/quadlet: $(SOURCES) go.mod go.sum
.PHONY: quadlet
quadlet: bin/quadlet
PHONY: podman-remote-static
podman-remote-static: $(SRCBINDIR)/podman-remote-static
PHONY: podman-remote-static_amd64 podman-remote-static_arm64
podman-remote-static_amd64: $(SRCBINDIR)/podman-remote-static_amd64
podman-remote-static_arm64: $(SRCBINDIR)/podman-remote-static_arm64
.PHONY: podman-winpath
podman-winpath: $(SOURCES) go.mod go.sum

View File

@ -244,10 +244,12 @@ spelled with complete minutiae.
$ make podman-remote-release-darwin_amd64.zip \
podman-remote-release-darwin_arm64.zip \
podman-remote-release-windows_amd64.zip \
podman-remote-static
podman-remote-static_amd64 \
podman-remote-static_arm64
$ mv podman-* bin/
$ cd bin/
$ tar -cvzf podman-remote-static.tar.gz podman-remote-static
$ tar -cvzf podman-remote-static_amd64.tar.gz podman-remote-static_amd64
$ tar -cvzf podman-remote-static_arm64.tar.gz podman-remote-static_arm64
$ sha256sum *.zip *.tar.gz > shasums
```
@ -270,7 +272,8 @@ spelled with complete minutiae.
* podman-remote-release-darwin_arm64.zip
* podman-remote-release-windows_amd64.zip
* podman-vX.Y.Z.msi
* podman-remote-static.tar.gz
* podman-remote-static_amd64.tar.gz
* podman-remote-static_arm64.tar.gz
* shasums
1. Click the Publish button to make the release (or pre-release)
available.

View File

@ -1,10 +1,10 @@
FROM registry.access.redhat.com/ubi8/go-toolset:latest AS builder
WORKDIR /opt/app-root/src
COPY . .
RUN make podman-remote-static
RUN make podman-remote-static_amd64
RUN GOOS=windows make podman-remote
RUN GOOS=darwin make podman-remote
FROM scratch
COPY --from=builder /opt/app-root/src/bin .
ENTRYPOINT ["/podman-remote-static"]
ENTRYPOINT ["/podman-remote-static_amd64"]

View File

@ -16,7 +16,7 @@ $ podman cp $(podman create --name remote-temp quay.io/containers/podman-remote-
- For Linux binary
```bash
$ podman cp $(podman create --name remote-temp quay.io/containers/podman-remote-artifacts:latest):/podman-remote-static . && podman rm remote-temp
$ podman cp $(podman create --name remote-temp quay.io/containers/podman-remote-artifacts:latest):/podman-remote-static_amd64 . && podman rm remote-temp
```
- For Mac binary