From 8db0bc9ae13d42d2a2cab965f5b757dc7260f55a Mon Sep 17 00:00:00 2001 From: Amir Zarrinkafsh Date: Thu, 24 Jun 2021 18:24:47 +1000 Subject: [PATCH] refactor: drop qemu binary requirement (#2116) QEMU binaries no longer need to be baked into containers. --- Dockerfile.arm32v7 | 5 +---- Dockerfile.arm64v8 | 5 +---- cmd/authelia-scripts/cmd_docker.go | 14 -------------- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index 2ba0216a..ec0b6934 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -28,11 +28,8 @@ FROM arm32v7/alpine:3.14.0 WORKDIR /app -COPY ./qemu-arm-static /usr/bin/qemu-arm-static - RUN \ -apk --no-cache add ca-certificates su-exec tzdata && \ -rm /usr/bin/qemu-arm-static +apk --no-cache add ca-certificates su-exec tzdata COPY --from=builder-backend /go/src/app/authelia /go/src/app/LICENSE /go/src/app/entrypoint.sh /go/src/app/healthcheck.sh ./ diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 index f8860733..baee6d18 100644 --- a/Dockerfile.arm64v8 +++ b/Dockerfile.arm64v8 @@ -28,11 +28,8 @@ FROM arm64v8/alpine:3.14.0 WORKDIR /app -COPY ./qemu-aarch64-static /usr/bin/qemu-aarch64-static - RUN \ -apk --no-cache add ca-certificates su-exec tzdata && \ -rm /usr/bin/qemu-aarch64-static +apk --no-cache add ca-certificates su-exec tzdata COPY --from=builder-backend /go/src/app/authelia /go/src/app/LICENSE /go/src/app/entrypoint.sh /go/src/app/healthcheck.sh ./ diff --git a/cmd/authelia-scripts/cmd_docker.go b/cmd/authelia-scripts/cmd_docker.go index a2141102..4f99ff54 100644 --- a/cmd/authelia-scripts/cmd_docker.go +++ b/cmd/authelia-scripts/cmd_docker.go @@ -46,8 +46,6 @@ func dockerBuildOfficialImage(arch string) error { docker := &Docker{} // Set default Architecture Dockerfile to amd64. dockerfile := "Dockerfile" - // Set version of QEMU. - qemuversion := "v5.2.0-2" // If not the default value. if arch != defaultArch { @@ -61,12 +59,6 @@ func dockerBuildOfficialImage(arch string) error { log.Fatal(err) } } - - err := utils.CommandWithStdout("bash", "-c", "wget https://github.com/multiarch/qemu-user-static/releases/download/"+qemuversion+"/qemu-arm-static -O ./qemu-arm-static && chmod +x ./qemu-arm-static").Run() - - if err != nil { - log.Fatal(err) - } } else if arch == "arm64v8" { if buildkiteQEMU != stringTrue { err := utils.CommandWithStdout("docker", "run", "--rm", "--privileged", "multiarch/qemu-user-static", "--reset", "-p", "yes").Run() @@ -74,12 +66,6 @@ func dockerBuildOfficialImage(arch string) error { log.Fatal(err) } } - - err := utils.CommandWithStdout("bash", "-c", "wget https://github.com/multiarch/qemu-user-static/releases/download/"+qemuversion+"/qemu-aarch64-static -O ./qemu-aarch64-static && chmod +x ./qemu-aarch64-static").Run() - - if err != nil { - log.Fatal(err) - } } flags, err := getXFlags(ciBranch, os.Getenv("BUILDKITE_BUILD_NUMBER"), "")