File tree Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -37,6 +37,16 @@ image_tag="20.04"
37
37
endif
38
38
# Set arch to linux/amd64 if it's not defined
39
39
arch ?= linux/amd64
40
+
41
+ # Detect the CPU architecture
42
+ CPU_ARCH := $(shell uname -m)
43
+ # Map the architecture to Docker platform
44
+ ifeq ($(CPU_ARCH ) , arm64)
45
+ arch := linux/arm64
46
+ else ifeq ($(CPU_ARCH), aarch64)
47
+ arch := linux/arm64
48
+ endif
49
+
40
50
buildx =0
41
51
cache_from=type=local,src =/tmp/.buildx-cache
42
52
cache_to=type=local,dest =/tmp/.buildx-cache
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ func_rpmsign_macros_init() {
28
28
# Macros for signing RPMs.
29
29
%_signature gpg
30
30
%_gpg_path ${HOME} /.gnupg
31
- %_gpg_name ${GPG_NAME} ${ GPG_MAIL}
31
+ %_gpg_name ${GPG_MAIL}
32
32
%_gpgbin /usr/bin/gpg
33
33
%__gpg_sign_cmd %{__gpg} gpg --batch --verbose --no-armor --pinentry-mode loopback --passphrase-file ${VAR_GPG_PASSPHRASE} --no-secmem-warning -u "%{_gpg_name}" -sbo %{__signature_filename} --digest-algo sha256 %{__plaintext_filename}
34
34
_EOC_
You can’t perform that action at this time.
0 commit comments