From b8c17b096fbb22324ffae6228aae1048e26657ab Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 24 Apr 2020 11:12:25 +0200 Subject: [PATCH] move build-multi-arch-image.sh to scripts/ Signed-off-by: Niels de Vos (cherry picked from commit 5a4517e38e836be1fabaec66eedfbb3befeadcd1) --- .travis.yml | 2 +- build-multi-arch-image.sh => scripts/build-multi-arch-image.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) rename build-multi-arch-image.sh => scripts/build-multi-arch-image.sh (97%) diff --git a/.travis.yml b/.travis.yml index 280d11ae1..ae3803f7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,7 @@ jobs: - name: Build multi-architecture image for amd64 and arm64 script: - - travis_wait ./build-multi-arch-image.sh || travis_terminate 1; + - travis_wait ./scripts/build-multi-arch-image.sh || travis_terminate 1; - name: containerized build script: diff --git a/build-multi-arch-image.sh b/scripts/build-multi-arch-image.sh similarity index 97% rename from build-multi-arch-image.sh rename to scripts/build-multi-arch-image.sh index 1edf57880..4908be1ab 100755 --- a/build-multi-arch-image.sh +++ b/scripts/build-multi-arch-image.sh @@ -3,6 +3,8 @@ set -xe # "docker manifest" requires experimental feature enabled export DOCKER_CLI_EXPERIMENTAL=enabled +cd "$(dirname "${0}")/.." + # ceph base image used for building multi architecture images dockerfile="deploy/cephcsi/image/Dockerfile" baseimg=$(awk -F = '/^ARG BASE_IMAGE=/ {print $NF}' "${dockerfile}")