From 17538088ba9e7037d7d5f7ecb27b370ee33c4903 Mon Sep 17 00:00:00 2001 From: "Brown, Joshua" Date: Mon, 4 Dec 2023 08:38:23 -0500 Subject: [PATCH] fix build images script --- compose/build_images_for_compose.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compose/build_images_for_compose.sh b/compose/build_images_for_compose.sh index c64343c4f..5db00adbb 100755 --- a/compose/build_images_for_compose.sh +++ b/compose/build_images_for_compose.sh @@ -7,24 +7,24 @@ SOURCE=$(dirname "$SCRIPT") PROJECT_ROOT=$(realpath ${SOURCE}/../) # Repository server and authz library -docker build -f ${PROJECT_ROOT}/repository/docker/Dockerfile.repo-base.ubuntu ${PROJECT_ROOT}/repository/ -t datafed/repo-base:latest +docker build -f ${PROJECT_ROOT}/repository/docker/Dockerfile.repo-base.ubuntu ${PROJECT_ROOT} -t datafed/repo-base:latest # Retag docker tag datafed/repo-base:latest code.ornl.gov:4567/dlsw/datafed/repo-base:latest -docker build -f ${PROJECT_ROOT}/repository/docker/Dockerfile.repo.ubuntu ${PROJECT_ROOT}/repository/ -t datafed/repo:latest +docker build -f ${PROJECT_ROOT}/repository/docker/Dockerfile.repo.ubuntu ${PROJECT_ROOT} -t datafed/repo:latest # Core and Web servers REPO_LIST=("web" "core") for REPO in "${REPO_LIST[@]}" do CONTAINER=${REPO} - docker build -f ${PROJECT_ROOT}/${REPO}/docker/Dockerfile.${REPO}-base.ubuntu ${PROJECT_ROOT}/${REPO}/ -t datafed/${CONTAINER}-base:latest + docker build -f ${PROJECT_ROOT}/${REPO}/docker/Dockerfile.${REPO}-base.ubuntu ${PROJECT_ROOT} -t datafed/${CONTAINER}-base:latest # Retag docker tag datafed/${CONTAINER}-base:latest code.ornl.gov:4567/dlsw/datafed/core-base:latest - docker build -f ${PROJECT_ROOT}/${REPO}/docker/Dockerfile.${REPO}.ubuntu ${PROJECT_ROOT}/${REPO}/ -t datafed/${CONTAINER}:latest + docker build -f ${PROJECT_ROOT}/${REPO}/docker/Dockerfile.${REPO}.ubuntu ${PROJECT_ROOT} -t datafed/${CONTAINER}:latest done # Python client -docker build -f ${PROJECT_ROOT}/python/docker/Dockerfile.python-client-base.ubuntu ${PROJECT_ROOT}/python/ -t datafed/python-client-base:latest +docker build -f ${PROJECT_ROOT}/python/docker/Dockerfile.python-client-base.ubuntu ${PROJECT_ROOT} -t datafed/python-client-base:latest # Retag docker tag datafed/python-client-base:latest code.ornl.gov:4567/dlsw/datafed/python-client:latest -docker build -f ${PROJECT_ROOT}/python/docker/Dockerfile.python-client.ubuntu ${PROJECT_ROOT}/python/ -t datafed/python-client:latest +docker build -f ${PROJECT_ROOT}/python/docker/Dockerfile.python-client.ubuntu ${PROJECT_ROOT} -t datafed/python-client:latest