Merge pull request #16667 from cfergeau/artifacts

Make released binary names more consistent
containers · Dec 3, 2022 · 3f80a68 · 3f80a68
2 parents 480c7fb + 54ef7f9
commit 3f80a68
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -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-linux_amd64 $(SRCBINDIR)/podman-remote-static-linux_arm64: $(SRCBINDIR)/podman-remote-static-linux_%: $(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-linux_amd64 podman-remote-static-linux_arm64
+podman-remote-static-linux_amd64: $(SRCBINDIR)/podman-remote-static-linux_amd64
+podman-remote-static-linux_arm64: $(SRCBINDIR)/podman-remote-static-linux_arm64
 
 .PHONY: podman-winpath
 podman-winpath: $(SOURCES) go.mod go.sum

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
@@ -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-linux_amd64 \
+          podman-remote-static-linux_arm64
       $ mv podman-* bin/
       $ cd bin/
-      $ tar -cvzf podman-remote-static.tar.gz podman-remote-static
+      $ tar -cvzf podman-remote-static-linux_amd64.tar.gz podman-remote-static-linux_amd64
+      $ tar -cvzf podman-remote-static-linux_arm64.tar.gz podman-remote-static-linux_arm64
       $ sha256sum *.zip *.tar.gz > shasums
       ```
 
@@ -272,7 +274,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-linux_amd64.tar.gz
+      * podman-remote-static-linux_arm64.tar.gz
       * shasums
    1. Click the Publish button to make the release (or pre-release)
       available.

diff --git a/contrib/pkginstaller/Makefile b/contrib/pkginstaller/Makefile
@@ -1,14 +1,19 @@
 SHELL := bash
 
 ARCH ?= aarch64
+ifeq ($(ARCH), aarch64)
+	GOARCH:=arm64
+else
+	GOARCH:=$(ARCH)
+endif
 GVPROXY_VERSION ?= 0.4.0
 QEMU_VERSION ?= 7.1.0-1
 GVPROXY_RELEASE_URL ?= https://github.com/containers/gvisor-tap-vsock/releases/download/v$(GVPROXY_VERSION)/gvproxy-darwin
 QEMU_RELEASE_URL ?= https://github.com/containers/podman-machine-qemu/releases/download/v$(QEMU_VERSION)/podman-machine-qemu-$(ARCH)-$(QEMU_VERSION).tar.xz
 PACKAGE_DIR ?= out/packaging
 TMP_DOWNLOAD ?= tmp-download
 PACKAGE_ROOT ?= root
-PKG_NAME := podman-installer-macos-$(ARCH).pkg
+PKG_NAME := podman-installer-macos-$(GOARCH).pkg
 
 default: pkginstaller
 

diff --git a/contrib/pkginstaller/package.sh b/contrib/pkginstaller/package.sh
@@ -17,10 +17,6 @@ arch=$(cat "${BASEDIR}/ARCH")
 
 function build_podman() {
   pushd "$1"
-    local goArch="${arch}"
-    if [ "${goArch}" = aarch64 ]; then
-        goArch=arm64
-    fi
     make GOARCH="${goArch}" podman-remote HELPER_BINARIES_DIR="${HELPER_BINARIES_DIR}"
     make GOARCH="${goArch}" podman-mac-helper
     cp bin/darwin/podman "contrib/pkginstaller/out/packaging/${binDir}/podman"
@@ -66,6 +62,11 @@ function signQemu() {
     --entitlements "${BASEDIR}/hvf.entitlements" "${qemuBinDir}/qemu-system-${qemuArch}"
 }
 
+goArch="${arch}"
+if [ "${goArch}" = aarch64 ]; then
+  goArch=arm64
+fi
+
 build_podman "../../../../"
 sign "${binDir}/podman"
 sign "${binDir}/gvproxy"
@@ -86,7 +87,7 @@ productbuild --distribution "${BASEDIR}/Distribution" \
 rm "${OUTPUT}/podman.pkg"
 
 if [ ! "${NO_CODESIGN}" -eq "1" ]; then
-  productsign --timestamp --sign "${PRODUCTSIGN_IDENTITY}" "${OUTPUT}/podman-unsigned.pkg" "${OUTPUT}/podman-installer-macos-${arch}.pkg"
+  productsign --timestamp --sign "${PRODUCTSIGN_IDENTITY}" "${OUTPUT}/podman-unsigned.pkg" "${OUTPUT}/podman-installer-macos-${goArch}.pkg"
 else
-  mv "${OUTPUT}/podman-unsigned.pkg" "${OUTPUT}/podman-installer-macos-${arch}.pkg"
+  mv "${OUTPUT}/podman-unsigned.pkg" "${OUTPUT}/podman-installer-macos-${goArch}.pkg"
 fi
diff --git a/contrib/podmanremoteimage/Containerfile b/contrib/podmanremoteimage/Containerfile
@@ -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-linux_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-linux_amd64"]
diff --git a/contrib/podmanremoteimage/README.md b/contrib/podmanremoteimage/README.md
@@ -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-linux_amd64 . && podman rm remote-temp
 ```
 
 - For Mac binary