Skip to content

Commit 7263be9

Browse files
shahmishalshahmishal
authored
Merge pull request #275 from apple/update-arch-lookup
Update the Ubuntu, CentOS, and Amazon Linux arch lookup
2 parents ff51ee6 + 9209c88 commit 7263be9

File tree

6 files changed

+32
-20
lines changed

6 files changed

+32
-20
lines changed

‎5.6/amazonlinux/2/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,16 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
3838
SWIFT_WEBROOT=$SWIFT_WEBROOT
3939

4040
RUN set -e; \
41-
ARCH_NAME="$(arch)"; \
41+
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
4242
url=; \
4343
case "${ARCH_NAME##*-}" in \
44+
'x86_64') \
45+
OS_ARCH_SUFFIX=''; \
46+
;; \
4447
'aarch64') \
4548
OS_ARCH_SUFFIX='-aarch64'; \
4649
;; \
47-
*) \
48-
OS_ARCH_SUFFIX='';\
50+
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
4951
esac; \
5052
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX" \
5153
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM$OS_ARCH_SUFFIX.tar.gz" \

‎5.6/amazonlinux/2/slim/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
2020
SWIFT_WEBROOT=$SWIFT_WEBROOT
2121

2222
RUN set -e; \
23-
ARCH_NAME="$(arch)"; \
23+
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
2424
url=; \
2525
case "${ARCH_NAME##*-}" in \
26+
'x86_64') \
27+
OS_ARCH_SUFFIX=''; \
28+
;; \
2629
'aarch64') \
2730
OS_ARCH_SUFFIX='-aarch64'; \
2831
;; \
29-
*) \
30-
OS_ARCH_SUFFIX='';\
32+
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
3133
esac; \
3234
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX" \
3335
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM$OS_ARCH_SUFFIX.tar.gz" \

‎5.6/centos/8/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,16 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
4141
SWIFT_WEBROOT=$SWIFT_WEBROOT
4242

4343
RUN set -e; \
44-
ARCH_NAME="$(arch)"; \
44+
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
4545
url=; \
4646
case "${ARCH_NAME##*-}" in \
47+
'x86_64') \
48+
OS_ARCH_SUFFIX=''; \
49+
;; \
4750
'aarch64') \
4851
OS_ARCH_SUFFIX='-aarch64'; \
4952
;; \
50-
*) \
51-
OS_ARCH_SUFFIX='';\
53+
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
5254
esac; \
5355
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX" \
5456
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM$OS_ARCH_SUFFIX.tar.gz" \

‎5.6/centos/8/slim/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
2020
SWIFT_WEBROOT=$SWIFT_WEBROOT
2121

2222
RUN set -e; \
23-
ARCH_NAME="$(arch)"; \
23+
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
2424
url=; \
2525
case "${ARCH_NAME##*-}" in \
26+
'x86_64') \
27+
OS_ARCH_SUFFIX=''; \
28+
;; \
2629
'aarch64') \
2730
OS_ARCH_SUFFIX='-aarch64'; \
2831
;; \
29-
*) \
30-
OS_ARCH_SUFFIX='';\
32+
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
3133
esac; \
3234
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX" \
3335
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM$OS_ARCH_SUFFIX.tar.gz" \

‎5.6/ubuntu/20.04/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,16 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
3939
SWIFT_WEBROOT=$SWIFT_WEBROOT
4040

4141
RUN set -e; \
42-
ARCH_NAME="$(arch)"; \
42+
ARCH_NAME="$(dpkg --print-architecture)"; \
4343
url=; \
4444
case "${ARCH_NAME##*-}" in \
45-
'aarch64') \
45+
'amd64') \
46+
OS_ARCH_SUFFIX=''; \
47+
;; \
48+
'arm64') \
4649
OS_ARCH_SUFFIX='-aarch64'; \
4750
;; \
48-
*) \
49-
OS_ARCH_SUFFIX='';\
51+
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
5052
esac; \
5153
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX" \
5254
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM$OS_ARCH_SUFFIX.tar.gz" \

‎5.6/ubuntu/20.04/slim/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,16 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
2727
SWIFT_WEBROOT=$SWIFT_WEBROOT
2828

2929
RUN set -e; \
30-
ARCH_NAME="$(arch)"; \
30+
ARCH_NAME="$(dpkg --print-architecture)"; \
3131
url=; \
3232
case "${ARCH_NAME##*-}" in \
33-
'aarch64') \
33+
'amd64') \
34+
OS_ARCH_SUFFIX=''; \
35+
;; \
36+
'arm64') \
3437
OS_ARCH_SUFFIX='-aarch64'; \
3538
;; \
36-
*) \
37-
OS_ARCH_SUFFIX='';\
39+
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
3840
esac; \
3941
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX" \
4042
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM$OS_ARCH_SUFFIX.tar.gz" \

0 commit comments

Comments
 (0)