From f37078e911076c3b897fa798a6346c5aa4517e81 Mon Sep 17 00:00:00 2001 From: Josh Kneubuhl Date: Fri, 16 Dec 2022 11:49:41 -0500 Subject: [PATCH] Run a full external link for CGO against musl when building in Docker Signed-off-by: Josh Kneubuhl --- .github/workflows/release.yml | 2 +- Makefile | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fc6e7de6a36..908c83dbbfa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ env: GO_VER: 1.18.7 ALPINE_VER: 3.16 FABRIC_VER: ${{ github.ref_name }} - DOCKER_REGISTRY: ghcr.io + DOCKER_REGISTRY: docker.io permissions: contents: read diff --git a/Makefile b/Makefile index bc702312b2b..6516554ab74 100644 --- a/Makefile +++ b/Makefile @@ -71,10 +71,6 @@ PROJECT_VERSION=$(FABRIC_VER)-snapshot-$(EXTRA_VERSION) TWO_DIGIT_VERSION = $(shell echo $(FABRIC_VER) | sed -e 's/^v\(.*\)/\1/' | cut -d '.' -f 1,2) PKGNAME = github.com/hyperledger/fabric - -# x86_64 or aarch64 in linux, amd64 or arm64 on darwin -UNAME_ARCH=$(shell uname -m) -# amd64 or arm64 ARCH=$(shell go env GOARCH) MARCH=$(shell go env GOOS)-$(shell go env GOARCH)