Skip to content

N
ngraph
Commit 638f36ee authored by DawnStone's avatar DawnStone Committed by Nick Korovaiko
Browse files
Options

added the reference OS marker to the image name defined in the contrib/docker/Makefile (#841) 

fixed variable settings in contrib/docker/make-dimage.sh script
parent c80a1076
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 16 deletions
contrib/docker/Makefile
View file @ 638f36ee
......@@ -46,7 +46,6 @@ DOCKUSER_HOME=/home/dockuser
VOLUME = -v "${DIR}:${DOCKUSER_HOME}/ngraph-test"
GIT_COMMIT = $(shell git rev-parse HEAD)
DBUILD_VERSION = ${GIT_COMMIT}_${PYTHON_VERSION}
DBUILD_DIR = ${DIR}/contrib/docker/.build-${DBUILD_VERSION}
# Look for evidence if GPU backend is supported on the platform
NVIDIA_SMI = $(shell which nvidia-smi)
......@@ -67,6 +66,8 @@ ifndef OS
OS="ubuntu1604"
endif
DBUILD_DIR = ${DIR}/contrib/docker/.build-${DBUILD_VERSION}_${OS}
# Configuration for specific reference OS in Dockerfiles
ifeq ("$(shell echo ${OS} | grep centos)","centos74")
RUN_AS_USER_SCRIPT=${DOCKUSER_HOME}/ngraph-test/contrib/docker/run_as_centos_user.sh
......@@ -133,12 +134,13 @@ expand_dockerfile_templates:
@echo "RUN_AS_USER_SCRIPT=${RUN_AS_USER_SCRIPT}"
cd "${DIR}"/contrib/docker
mkdir "${DBUILD_DIR}" || true
sed -e 's/\(FROM ngraph.*\)/\1:${DBUILD_VERSION}/' ${DOCKERFILE} > "${DBUILD_DIR}"/Dockerfile.build_ngraph
sed -e 's/\(FROM ngraph.*\)/\1:${DBUILD_VERSION}/' ${DOCKERFILE} > "${DBUILD_DIR}/Dockerfile.build_ngraph_${OS}"
build_docker_image: expand_dockerfile_templates
@echo "OS=${OS}"
@echo ${DBUILD_DIR}
export CONTEXTDIR=${DBUILD_DIR};./make-dimage.sh
docker tag build_ngraph:latest build_ngraph:${DBUILD_VERSION}
export CONTEXTDIR=${DBUILD_DIR};export DOCKER_TAG=build_ngraph_${OS};./make-dimage.sh
docker tag build_ngraph_${OS}:latest build_ngraph_${OS}:${DBUILD_VERSION}
build_docker: build_docker_image
......@@ -153,7 +155,7 @@ sphinx_doc: build_docker_image
${DOCKER_RUN_ENV} \
--env RUN_UID="$(shell id -u)" \
--env RUN_CMD="${DOCKUSER_HOME}/ngraph-test/contrib/docker/build-ngraph-docs.sh" \
"build_ngraph:${DBUILD_VERSION}" \
"build_ngraph_${OS}:${DBUILD_VERSION}" \
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
# Build
......@@ -176,7 +178,7 @@ build_gcc: build_docker_image
--env CMD_TO_RUN='build_gcc' \
--env RUN_UID="$(shell id -u)" \
--env RUN_CMD="${DOCKUSER_HOME}/ngraph-test/contrib/docker/build-ngraph-and-test.sh" \
"build_ngraph:${DBUILD_VERSION}" \
"build_ngraph_${OS}:${DBUILD_VERSION}" \
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
# Build targets ALWAYS clean build directories (BUILD-GCC, BUILD-CLANG) prior to building
......@@ -196,7 +198,7 @@ build_clang: build_docker_image
--env CMD_TO_RUN='build_clang' \
--env RUN_UID="$(shell id -u)" \
--env RUN_CMD="${DOCKUSER_HOME}/ngraph-test/contrib/docker/build-ngraph-and-test.sh" \
"build_ngraph:${DBUILD_VERSION}" \
"build_ngraph_${OS}:${DBUILD_VERSION}" \
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
# Check (run unit-tests)
......@@ -215,7 +217,7 @@ check_gcc: build_gcc
--env CMD_TO_RUN=check_gcc \
--env RUN_UID="$(shell id -u)" \
--env RUN_CMD="${DOCKUSER_HOME}/ngraph-test/contrib/docker/build-ngraph-and-test.sh" \
"build_ngraph:${DBUILD_VERSION}" \
"build_ngraph_${OS}:${DBUILD_VERSION}" \
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
# Always use the platform-specific docker command to run unit tests
......@@ -231,7 +233,7 @@ check_clang: build_clang
--env CMD_TO_RUN=check_clang \
--env RUN_UID="$(shell id -u)" \
--env RUN_CMD="${DOCKUSER_HOME}/ngraph-test/contrib/docker/build-ngraph-and-test.sh" \
"build_ngraph:${DBUILD_VERSION}" \
"build_ngraph_${OS}:${DBUILD_VERSION}" \
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
# Always use the platform-specific docker command to run unit tests
......@@ -246,7 +248,7 @@ unit_test_check_gcc: build_gcc
--env CMD_TO_RUN='unit-test-check_gcc' \
--env RUN_UID="$(shell id -u)" \
--env RUN_CMD="${DOCKUSER_HOME}/ngraph-test/contrib/docker/build-ngraph-and-test.sh" \
"build_ngraph:${DBUILD_VERSION}" \
"build_ngraph_${OS}:${DBUILD_VERSION}" \
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
# Always use the platform-specific docker command to run unit tests
......@@ -261,7 +263,7 @@ unit_test_check_clang: build_clang
--env CMD_TO_RUN='unit-test-check_clang' \
--env RUN_UID="$(shell id -u)" \
--env RUN_CMD="${DOCKUSER_HOME}/ngraph-test/contrib/docker/build-ngraph-and-test.sh" \
"build_ngraph:${DBUILD_VERSION}" \
"build_ngraph_${OS}:${DBUILD_VERSION}" \
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
style_check_clang: build_clang
......@@ -284,7 +286,7 @@ install_gcc: build_gcc
--env CMD_TO_RUN=install_gcc \
--env RUN_UID="$(shell id -u)" \
--env RUN_CMD="${DOCKUSER_HOME}/ngraph-test/contrib/docker/build-ngraph-and-test.sh" \
"build_ngraph:${DBUILD_VERSION}" \
"build_ngraph_${OS}:${DBUILD_VERSION}" \
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
# install targets do not depend on GPU dependencies
......@@ -301,7 +303,7 @@ install_clang: build_clang
--env CMD_TO_RUN=install_clang \
--env RUN_UID="$(shell id -u)" \
--env RUN_CMD="${DOCKUSER_HOME}/ngraph-test/contrib/docker/build-ngraph-and-test.sh" \
"build_ngraph:${DBUILD_VERSION}" \
"build_ngraph_${OS}:${DBUILD_VERSION}" \
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
# Interactive shell
......@@ -314,7 +316,7 @@ shell: build_docker_image
${VOLUME} \
${DOCKER_RUN_ENV} \
--env RUN_UID="$(shell id -u)" \
"build_ngraph:${DBUILD_VERSION}" \
"build_ngraph_${OS}:${DBUILD_VERSION}" \
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
# Clean
......
contrib/docker/make-dimage.sh
View file @ 638f36ee
......@@ -22,11 +22,11 @@ set -e
#set -u
set -o pipefail
if [ -n $DOCKER_TAG ]; then
if [ -z $DOCKER_TAG ]; then
DOCKER_TAG=build_ngraph
fi
if [ -n $DOCKER_IMAGE_NAME ]; then
if [ -z $DOCKER_IMAGE_NAME ]; then
DOCKER_IMAGE_NAME=${DOCKER_TAG}
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment