Skip to content

Commit fdad19d

Browse files
authored
Remove superfluous architecture prefix (AppImage#100)
Docker supports architecture-specific tagging now. No need to distinguish between them using architecture prefixes.
1 parent 432cb80 commit fdad19d

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

scripts/docker/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
ARG docker_arch
2-
FROM ${docker_arch}/alpine:3.20
1+
FROM alpine:3.20
32

43
# includes dependencies from https://git.alpinelinux.org/aports/tree/main/fuse3/APKBUILD
54
RUN apk add --no-cache \

scripts/docker/create-build-container.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,15 @@ fi
1212
# guess architecture name compatible with Docker from $ARCH
1313
case "${ARCH}" in
1414
x86_64)
15-
docker_arch=amd64
1615
docker_platform=linux/amd64
1716
;;
1817
i686)
19-
docker_arch=i386
2018
docker_platform=linux/i386
2119
;;
2220
armhf)
23-
docker_arch=arm32v7
2421
docker_platform=linux/arm/v7
2522
;;
2623
aarch64)
27-
docker_arch=arm64v8
2824
docker_platform=linux/arm64/v8
2925
;;
3026
*)
@@ -33,12 +29,12 @@ case "${ARCH}" in
3329
;;
3430
esac
3531

36-
image_name="$docker_arch"/type2-runtime-build
32+
image_name=type2-runtime-build
3733

3834
# first, we need to build the image
3935
# if nothing has changed, it'll run over this within a few seconds
4036
repo_root_dir="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")"/../../
41-
docker build --build-arg docker_arch="$docker_arch" --platform "$docker_platform" -t "$image_name" -f "$repo_root_dir"/scripts/docker/Dockerfile "$repo_root_dir"
37+
docker build --platform "$docker_platform" -t "$image_name" -f "$repo_root_dir"/scripts/docker/Dockerfile "$repo_root_dir"
4238

4339
docker_run_args=()
4440
[[ -t 0 ]] && docker_run_args+=("-t")

0 commit comments

Comments
 (0)