Remove reproducible builder image (#7484)

The image has been moved to gh/tendemrint/images.

Makefile

@@ -110,10 +110,10 @@ $(BUILDDIR)/:
 	mkdir -p $(BUILDDIR)/
 
 build-simd-all: go.sum
-	$(if $(shell docker inspect -f '{{ .Id }}' cosmossdk/rbuilder 2>/dev/null),$(info found image cosmossdk/rbuilder),docker pull cosmossdk/rbuilder:latest)
+	docker pull cosmossdk/rbuilder:latest
 	docker rm latest-build || true
 	docker run --volume=$(CURDIR):/sources:ro \
-        --env TARGET_OS='darwin linux windows' \
+        --env TARGET_PLATFORMS='linux/amd64 darwin/amd64 linux/arm64 windows/amd64' \
         --env APP=simd \
         --env VERSION=$(VERSION) \
         --env COMMIT=$(COMMIT) \
@@ -122,10 +122,10 @@ build-simd-all: go.sum
 	docker cp -a latest-build:/home/builder/artifacts/ $(CURDIR)/
 
 build-simd-linux: go.sum $(BUILDDIR)/
-	$(if $(shell docker inspect -f '{{ .Id }}' cosmossdk/rbuilder 2>/dev/null),$(info found image cosmossdk/rbuilder),docker pull cosmossdk/rbuilder:latest)
+	docker pull cosmossdk/rbuilder:latest
 	docker rm latest-build || true
 	docker run --volume=$(CURDIR):/sources:ro \
-        --env TARGET_OS='linux' \
+        --env TARGET_PLATFORMS='linux/amd64' \
         --env APP=simd \
         --env VERSION=$(VERSION) \
         --env COMMIT=$(COMMIT) \

build.sh

@@ -18,22 +18,27 @@ set -ue
 # - OUTDIR
 
 # Build for each os-architecture pair
-for os in ${TARGET_OS} ; do
-    archs="`f_build_archs ${os}`"
-    exe_file_extension="`f_binary_file_ext ${os}`"
-    for arch in ${archs} ; do
-        make clean
-        GOOS="${os}" GOARCH="${arch}" GOROOT_FINAL="$(go env GOROOT)" \
-        make build \
-            LDFLAGS=-buildid=${VERSION} \
-            VERSION=${VERSION} \
-            COMMIT=${COMMIT} \
-            LEDGER_ENABLED=${LEDGER_ENABLED}
-        mv ./build/${APP}${exe_file_extension} ${OUTDIR}/${APP}-${VERSION}-${os}-${arch}${exe_file_extension}
-    done
-    unset exe_file_extension
+for platform in ${TARGET_PLATFORMS} ; do
+    # This function sets GOOS, GOARCH, and OS_FILE_EXT environment variables
+    # according to the build target platform. OS_FILE_EXT is empty in all
+    # cases except when the target platform is 'windows'.
+    setup_build_env_for_platform "${platform}"
+
+    make clean
+    echo Building for $(go env GOOS)/$(go env GOARCH) >&2
+    GOROOT_FINAL="$(go env GOROOT)" \
+    make build \
+        LDFLAGS=-buildid=${VERSION} \
+        VERSION=${VERSION} \
+        COMMIT=${COMMIT} \
+        LEDGER_ENABLED=${LEDGER_ENABLED}
+    mv ./build/${APP}${OS_FILE_EXT} ${OUTDIR}/${APP}-${VERSION}-$(go env GOOS)-$(go env GOARCH)${OS_FILE_EXT}
+
+    # This function restore the build environment variables to their
+    # original state.
+    restore_build_env
 done
 
-# Generate and display build report
-f_generate_build_report ${OUTDIR}
+# Generate and display build report.
+generate_build_report
 cat ${OUTDIR}/build_report

contrib/images/Makefile

@@ -3,7 +3,4 @@ all: simd-env
 simd-env:
 	docker build --build-arg UID=$(shell id -u) --build-arg GID=$(shell id -g) --tag cosmossdk/simd-env simd-env
 
-rbuilder:
-	docker build --tag cosmossdk/rbuilder rbuilder
-
-.PHONY: all simd-env rbuilder
+.PHONY: all simd-env