mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 02:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: use BASE_IMAGE from build.env

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos
2020-06-22 15:54:18 +02:00
committed by mergify[bot]
parent f1da7d9bd1
commit 4fd973b924
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/Dockerfile.devel
View File

@ -1,4 +1,5 @@
FROM ceph/ceph:v15
ARG BASE_IMAGE
FROM ${BASE_IMAGE}
ARG GOROOT=/usr/local/go

4
scripts/build-multi-arch-image.sh
View File

@ -10,8 +10,8 @@ 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}")
build_env="build.env"
baseimg=$(awk -F = '/^BASE_IMAGE=/ {print $NF}' "${build_env}")
# get image digest per architecture
# {