diff --git a/ci/utils/build_docker_image.sh b/ci/utils/build_docker_image.sh index da9408dfac03eabb4c481ee41dc9ea64ec111033..2ea5e089ec914dfac478cbe363272cfb71928f63 100755 --- a/ci/utils/build_docker_image.sh +++ b/ci/utils/build_docker_image.sh @@ -17,7 +17,7 @@ set -feu -o pipefail SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" NTHREADS="$(nproc)" -UBUNTU_RELEASE=${1:-jammy} -GRICAD_REGISTRY_URL='gricad-registry.univ-grenoble-alpes.fr' +DOCKER_IMAGE_TAG=${1:-jammy} +HYSOP_REGISTRY_URL='gricad-registry.univ-grenoble-alpes.fr' -docker build --rm=true --build-arg "NTHREADS=$NTHREADS" -t "${GRICAD_REGISTRY_URL}/particle_methods/hysop:${UBUNTU_RELEASE}" -f "${SCRIPT_DIR}/../docker_images/ubuntu/${UBUNTU_RELEASE}/Dockerfile" "${SCRIPT_DIR}/../.." +docker build --rm=true --build-arg "NTHREADS=$NTHREADS" -t "${HYSOP_REGISTRY_URL}/particle_methods/hysop:${DOCKER_IMAGE_TAG}" -f "${SCRIPT_DIR}/../docker_images/ubuntu/${DOCKER_IMAGE_TAG}/Dockerfile" "${SCRIPT_DIR}/../.." diff --git a/ci/utils/pull_docker_image.sh b/ci/utils/pull_docker_image.sh index c77068138f910ce51891b1a16d25780030509f36..46d12f5a66d9c0fb153341a8c2183e714ef7cb59 100755 --- a/ci/utils/pull_docker_image.sh +++ b/ci/utils/pull_docker_image.sh @@ -15,12 +15,13 @@ ## limitations under the License. ## set -euf -o pipefail -UBUNTU_RELEASE=${1:-jammy} -GRICAD_REGISTRY_URL='gricad-registry.univ-grenoble-alpes.fr' +DOCKER_IMAGE_TAG=${1:-jammy} +HYSOP_REGISTRY_URL='gricad-registry.univ-grenoble-alpes.fr' docker logout -if [[ -z "${GRICAD_USERNAME}" ]] || [[ -z "${GRICAD_REGISTRY_TOKEN}" ]]; then - docker login "${GRICAD_REGISTRY_URL}" +if [[ -z "${HYSOP_REGISTRY_USERNAME}" ]] || [[ -z "${HYSOP_REGISTRY_TOKEN}" ]]; then + docker login "${HYSOP_REGISTRY_URL}" else - echo "${GRICAD_REGISTRY_TOKEN}" | docker login "${GRICAD_REGISTRY_URL}" --username "${GRICAD_USERNAME}" --password-stdin + echo "${HYSOP_REGISTRY_TOKEN}" | docker login "${HYSOP_REGISTRY_URL}" --username "${HYSOP_REGISTRY_USERNAME}" --password-stdin fi -docker pull "${GRICAD_REGISTRY_URL}/particle_methods/hysop:${UBUNTU_RELEASE}" +docker pull "${HYSOP_REGISTRY_URL}/particle_methods/hysop:${DOCKER_IMAGE_TAG}" +docker logout diff --git a/ci/utils/push_docker_image.sh b/ci/utils/push_docker_image.sh index 06d50ffaeb1162dbe69dc82e5ccdfc722732b758..c4e9a855efddd3e7797d3484a6c9a12d54466b39 100755 --- a/ci/utils/push_docker_image.sh +++ b/ci/utils/push_docker_image.sh @@ -15,13 +15,13 @@ ## limitations under the License. ## set -euf -o pipefail -UBUNTU_RELEASE=${1:-jammy} -GRICAD_REGISTRY_URL='gricad-registry.univ-grenoble-alpes.fr' +DOCKER_IMAGE_TAG=${1:-jammy} +HYSOP_REGISTRY_URL='gricad-registry.univ-grenoble-alpes.fr' docker logout -if [[ -z "${GRICAD_USERNAME}" ]] || [[ -z "${GRICAD_REGISTRY_TOKEN}" ]]; then - docker login "${GRICAD_REGISTRY_URL}" +if [[ -z "${HYSOP_REGISTRY_USERNAME}" ]] || [[ -z "${HYSOP_REGISTRY_TOKEN}" ]]; then + docker login "${HYSOP_REGISTRY_URL}" else - echo "${GRICAD_REGISTRY_TOKEN}" | docker login "${GRICAD_REGISTRY_URL}" --username "${GRICAD_USERNAME}" --password-stdin + echo "${HYSOP_REGISTRY_TOKEN}" | docker login "${HYSOP_REGISTRY_URL}" --username "${HYSOP_REGISTRY_USERNAME}" --password-stdin fi -docker push "${GRICAD_REGISTRY_URL}/particle_methods/hysop:${UBUNTU_RELEASE}" +docker push "${HYSOP_REGISTRY_URL}/particle_methods/hysop:${DOCKER_IMAGE_TAG}" docker logout diff --git a/ci/utils/run_ci.sh b/ci/utils/run_ci.sh index bc9f751400120bdccde48d9e22d37b75c6018728..a279f4e36e85d7b966ba891ff8de89156ce8b0d8 100755 --- a/ci/utils/run_ci.sh +++ b/ci/utils/run_ci.sh @@ -16,12 +16,12 @@ ## set -feu -o pipefail SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -UBUNTU_RELEASE=${1:-jammy} -GRICAD_REGISTRY_URL='gricad-registry.univ-grenoble-alpes.fr' -DOCKER_IMG="${GRICAD_REGISTRY_URL}/particle_methods/hysop:${UBUNTU_RELEASE}" +DOCKER_IMAGE_TAG=${1:-jammy} +HYSOP_REGISTRY_URL='gricad-registry.univ-grenoble-alpes.fr' +DOCKER_IMG="${HYSOP_REGISTRY_URL}/particle_methods/hysop:${DOCKER_IMAGE_TAG}" CONTAINER_ID='hysop_build_and_test' -if [[ $UBUNTU_RELEASE == *_cuda ]]; then +if [[ ${DOCKER_IMAGE_TAG} == *_cuda ]]; then EXTRA_ARGS="--gpus all" else EXTRA_ARGS="" diff --git a/ci/utils/run_debug.sh b/ci/utils/run_debug.sh index 7bf8c66921b9df907906ffae4b7524b099b4ab1f..bd6f911904b297fbc5b5700ea0492d15e5e700ad 100755 --- a/ci/utils/run_debug.sh +++ b/ci/utils/run_debug.sh @@ -16,12 +16,12 @@ ## set -feu -o pipefail SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -UBUNTU_RELEASE=${1:-jammy} -GRICAD_REGISTRY_URL='gricad-registry.univ-grenoble-alpes.fr' -DOCKER_IMG="${GRICAD_REGISTRY_URL}/particle_methods/hysop:${UBUNTU_RELEASE}" +DOCKER_IMAGE_TAG=${1:-jammy} +HYSOP_REGISTRY_URL='gricad-registry.univ-grenoble-alpes.fr' +DOCKER_IMG="${HYSOP_REGISTRY_URL}/particle_methods/hysop:${DOCKER_IMAGE_TAG}" CONTAINER_ID='hysop_build_and_debug' -if [[ $UBUNTU_RELEASE == *_cuda ]]; then +if [[ ${DOCKER_IMAGE_TAG} == *_cuda ]]; then EXTRA_ARGS="--gpus all" else EXTRA_ARGS="" diff --git a/ci/utils/run_docker_image.sh b/ci/utils/run_docker_image.sh index 2372adf32483b5b4ddab14fc6d0ae15e07c8e5f8..47472d361a418f5306942ee6c770f908ab325125 100755 --- a/ci/utils/run_docker_image.sh +++ b/ci/utils/run_docker_image.sh @@ -16,13 +16,13 @@ ## set -feu -o pipefail SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -UBUNTU_RELEASE=${1:-jammy} -GRICAD_REGISTRY_URL='gricad-registry.univ-grenoble-alpes.fr' +DOCKER_IMAGE_TAG=${1:-jammy} +HYSOP_REGISTRY_URL='gricad-registry.univ-grenoble-alpes.fr' -if [[ $UBUNTU_RELEASE == *_cuda ]]; then +if [[ ${DOCKER_IMAGE_TAG} == *_cuda ]]; then EXTRA_ARGS="--gpus all" else EXTRA_ARGS="" fi -docker run --cap-add=SYS_PTRACE ${EXTRA_ARGS} -it -v "${SCRIPT_DIR}/../..:/hysop:ro" "${GRICAD_REGISTRY_URL}/particle_methods/hysop:${UBUNTU_RELEASE}" +docker run --cap-add=SYS_PTRACE ${EXTRA_ARGS} -it -v "${SCRIPT_DIR}/../..:/hysop:ro" "${HYSOP_REGISTRY_URL}/particle_methods/hysop:${DOCKER_IMAGE_TAG}"