Skip to content

Commit 974b080

Browse files
committed
launcher: use normal image for arm64 installs
We now publish images with multi-arch manifests, so no need to use a special tag
1 parent c73028a commit 974b080

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

launcher

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -233,16 +233,13 @@ check_prereqs() {
233233
echo "WARNING: Docker version ${test} deprecated, recommend upgrade to ${docker_rec_version} or newer."
234234
fi
235235

236-
arm=false
237236
case $(uname -m) in
238237
armv7l)
239238
echo "ERROR: 32bit arm is not supported. Check if your hardware support arm64, which is supported in experimental capacity."
240239
exit 1
241240
;;
242241
aarch64 | arm64)
243-
echo "WARNING: Support for aarch64 is experimental at the moment. Please report any problems at https://meta.discourse.org/tag/arm"
244-
image="discourse/base:aarch64"
245-
arm=true
242+
echo "arm64 arch detected."
246243
;;
247244
x86_64)
248245
echo "x86_64 arch detected."
@@ -257,18 +254,6 @@ check_prereqs() {
257254
# 4. discourse docker image is downloaded
258255
test=`$docker_path images | awk '{print $1 ":" $2 }' | grep "$image"`
259256

260-
# arm experimental support is on a fixed tag, always pull
261-
if [ -z "$test" ] || [ $arm = true ]; then
262-
echo
263-
echo "WARNING: We are about to start downloading the Discourse base image"
264-
echo "This process may take anywhere between a few minutes to an hour, depending on your network speed"
265-
echo
266-
echo "Please be patient"
267-
echo
268-
269-
pull_image
270-
fi
271-
272257
# 5. running recommended git version
273258
test=($($git_path --version)) # Get git version string
274259
test=${test[2]//,/} # Get version alone and strip comma if exists

0 commit comments

Comments
 (0)