linux: Add -linux suffix to podman-remote-static binaries

This is more consistent with the name of the other released files, and
makes identification of the binaries easier among the Windows/macOS
ones.

Related: https://github.com/containers/podman/issues/16612
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
Christophe Fergeau
2022-11-29 10:44:22 +01:00
parent d223950078
commit fe548dd0b0
4 changed files with 13 additions and 13 deletions

View File

@ -335,7 +335,7 @@ $(SRCBINDIR)/podman$(BINSFX): $(SOURCES) go.mod go.sum | $(SRCBINDIR)
-tags "${REMOTETAGS}" \ -tags "${REMOTETAGS}" \
-o $@ ./cmd/podman -o $@ ./cmd/podman
$(SRCBINDIR)/podman-remote-static_amd64 $(SRCBINDIR)/podman-remote-static_arm64: $(SRCBINDIR)/podman-remote-static_%: $(SRCBINDIR) $(SOURCES) go.mod go.sum $(SRCBINDIR)/podman-remote-static-linux_amd64 $(SRCBINDIR)/podman-remote-static-linux_arm64: $(SRCBINDIR)/podman-remote-static-linux_%: $(SRCBINDIR) $(SOURCES) go.mod go.sum
CGO_ENABLED=0 \ CGO_ENABLED=0 \
GOOS=linux \ GOOS=linux \
GOARCH=$* \ GOARCH=$* \
@ -362,9 +362,9 @@ $(SRCBINDIR)/quadlet: $(SOURCES) go.mod go.sum
.PHONY: quadlet .PHONY: quadlet
quadlet: bin/quadlet quadlet: bin/quadlet
PHONY: podman-remote-static_amd64 podman-remote-static_arm64 PHONY: podman-remote-static-linux_amd64 podman-remote-static-linux_arm64
podman-remote-static_amd64: $(SRCBINDIR)/podman-remote-static_amd64 podman-remote-static-linux_amd64: $(SRCBINDIR)/podman-remote-static-linux_amd64
podman-remote-static_arm64: $(SRCBINDIR)/podman-remote-static_arm64 podman-remote-static-linux_arm64: $(SRCBINDIR)/podman-remote-static-linux_arm64
.PHONY: podman-winpath .PHONY: podman-winpath
podman-winpath: $(SOURCES) go.mod go.sum podman-winpath: $(SOURCES) go.mod go.sum

View File

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

View File

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

View File

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