diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7de34db24..1e313520d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,8 +6,8 @@ variables: CRITERION_OPTS: --ignore-warnings DOCKER_FILE: packaging/docker/Dockerfile.dev DOCKER_TAG: ${CI_COMMIT_REF_NAME} - DOCKER_IMAGE: registry.git.rwth-aachen.de/acs/public/villas/villasnode/node - DOCKER_IMAGE_DEV: registry.git.rwth-aachen.de/acs/public/villas/villasnode/node-dev + DOCKER_IMAGE: registry.git.rwth-aachen.de/acs/public/villas/node + DOCKER_IMAGE_DEV: registry.git.rwth-aachen.de/acs/public/villas/node/dev MAKE_OPTS: -j32 RELEASEVER: 29 @@ -40,26 +40,26 @@ prepare:raspbian:docker-dev: extends: prepare:fedora:docker-dev variables: DOCKER_FILE: packaging/docker/Dockerfile.dev-raspbian - DOCKER_IMAGE_DEV: villas/node-dev-raspbian + DOCKER_IMAGE_DEV: registry.git.rwth-aachen.de/acs/public/villas/node/dev-raspbian prepare:ubuntu:docker-dev: extends: prepare:fedora:docker-dev variables: DOCKER_FILE: packaging/docker/Dockerfile.dev-ubuntu - DOCKER_IMAGE_DEV: villas/node-dev-ubuntu + DOCKER_IMAGE_DEV: registry.git.rwth-aachen.de/acs/public/villas/node/dev-ubuntu prepare:debian-armhf:docker-dev: extends: prepare:fedora:docker-dev variables: DOCKER_FILE: packaging/docker/Dockerfile.dev-debian-multiarch - DOCKER_IMAGE_DEV: villas/node-dev-debian-armhf + DOCKER_IMAGE_DEV: registry.git.rwth-aachen.de/acs/public/villas/node/dev-debian-armhf DOCKER_OPTS: --build-arg ARCH=armhf --build-arg TRIPLET=arm-linux-gnueabihf prepare:debian-arm64:docker-dev: extends: prepare:fedora:docker-dev variables: DOCKER_FILE: packaging/docker/Dockerfile.dev-debian-multiarch - DOCKER_IMAGE_DEV: villas/node-dev-debian-arm64 + DOCKER_IMAGE_DEV: registry.git.rwth-aachen.de/acs/public/villas/node/dev-debian-arm64 DOCKER_OPTS: --build-arg ARCH=arm64 --build-arg TRIPLET=aarch64-linux-gnu # Stage: build @@ -87,26 +87,26 @@ build:fedora-minimal:x86_64: build:ubuntu:x86_64: extends: build:fedora:x86_64 variables: - DOCKER_IMAGE_DEV: villas/node-dev-ubuntu + DOCKER_IMAGE_DEV: registry.git.rwth-aachen.de/acs/public/villas/node/dev-ubuntu CMAKE_OPTS: -DCMAKE_MODULE_PATH=/usr/local/lib64/cmake -DCMAKE_PREFIX_PATH=/usr/local build:raspbian:armv6l: extends: build:fedora:x86_64 variables: - DOCKER_IMAGE_DEV: villas/node-dev-raspbian + DOCKER_IMAGE_DEV: registry.git.rwth-aachen.de/acs/public/villas/node/dev-raspbian CMAKE_OPTS: -DWITH_NODE_INFINIBAND=OFF when: manual build:debian-multiarch:armhf: extends: build:fedora:x86_64 variables: - DOCKER_IMAGE_DEV: villas/node-dev-debian-armhf + DOCKER_IMAGE_DEV: registry.git.rwth-aachen.de/acs/public/villas/node/dev-debian-armhf CMAKE_OPTS: -DCMAKE_TOOLCHAIN_FILE=/debian-armhf.cmake -DCMAKE_INSTALL_LIBDIR=/usr/lib/arm-linux-gnueabihf build:debian-multiarch:arm64: extends: build:fedora:x86_64 variables: - DOCKER_IMAGE_DEV: villas/node-dev-debian-arm64 + DOCKER_IMAGE_DEV: registry.git.rwth-aachen.de/acs/public/villas/node/dev-debian-arm64 CMAKE_OPTS: -DCMAKE_TOOLCHAIN_FILE=/debian-arm64.cmake -DCMAKE_INSTALL_LIBDIR=/usr/lib/aarch64-linux-gnu build:docs: diff --git a/packaging/docker/CMakeLists.txt b/packaging/docker/CMakeLists.txt index 7f8957e15..77c9532f3 100644 --- a/packaging/docker/CMakeLists.txt +++ b/packaging/docker/CMakeLists.txt @@ -21,7 +21,7 @@ ################################################################################### set(DOCKER_FILE Dockerfile) -set(DOCKER_IMAGE villas/node) +set(DOCKER_IMAGE registry.git.rwth-aachen.de/acs/public/villas/node) set(DOCKER_TAG ${CMAKE_PROJECT_GIT_BRANCH}) set(DOCKER_RUN_OPTS --interactive @@ -38,29 +38,29 @@ set(DOCKER_RUN_OPTS foreach(SUFFIX app dev dev-centos dev-ubuntu dev-raspbian) add_custom_target(deploy-docker-${SUFFIX} - COMMAND docker push ${DOCKER_IMAGE}-${SUFFIX}:${DOCKER_TAG} - COMMAND docker push ${DOCKER_IMAGE}-${SUFFIX}:latest - COMMENT "Deploy Docker image: ${DOCKER_IMAGE}-${SUFFIX}:${DOCKER_TAG}" + COMMAND docker push ${DOCKER_IMAGE}/${SUFFIX}:${DOCKER_TAG} + COMMAND docker push ${DOCKER_IMAGE}/${SUFFIX}:latest + COMMENT "Deploy Docker image: ${DOCKER_IMAGE}/${SUFFIX}:${DOCKER_TAG}" ) add_custom_target(run-docker-${SUFFIX} - COMMAND docker run ${DOCKER_RUN_OPTS} ${DOCKER_IMAGE}-${SUFFIX}:${DOCKER_TAG} - COMMENT "Run Docker image: ${DOCKER_IMAGE}-${SUFFIX}:${DOCKER_TAG}" + COMMAND docker run ${DOCKER_RUN_OPTS} ${DOCKER_IMAGE}/${SUFFIX}:${DOCKER_TAG} + COMMENT "Run Docker image: ${DOCKER_IMAGE}/${SUFFIX}:${DOCKER_TAG}" ) add_custom_target(docker-${SUFFIX} COMMAND docker build --file ${CMAKE_CURRENT_SOURCE_DIR}/Dockerfile.${SUFFIX} - --tag ${DOCKER_IMAGE}-${SUFFIX}:${DOCKER_TAG} - --tag ${DOCKER_IMAGE}-${SUFFIX}:latest - --build-arg BUILDER_IMAGE=${DOCKER_IMAGE}-dev:${DOCKER_TAG} + --tag ${DOCKER_IMAGE}/${SUFFIX}:${DOCKER_TAG} + --tag ${DOCKER_IMAGE}/${SUFFIX}:latest + --build-arg BUILDER_IMAGE=${DOCKER_IMAGE}/dev:${DOCKER_TAG} --build-arg DOCKER_TAG=${DOCKER_TAG} --build-arg GIT_BRANCH=${CMAKE_PROJECT_GIT_BRANCH} --build-arg GIT_REV=${CMAKE_PROJECT_GIT_REV} --build-arg VERSION=${CMAKE_PROJECT_VERSION} --build-arg VARIANT=${CMAKE_PROJECT_VARIANT} ${DOCKER_BUILD_OPTS} ${PROJECT_SOURCE_DIR} - COMMENT "Build Docker image: ${DOCKER_IMAGE}-${SUFFIX}:${DOCKER_TAG}" + COMMENT "Build Docker image: ${DOCKER_IMAGE}/${SUFFIX}:${DOCKER_TAG}" ) add_dependencies(deploy-docker-${SUFFIX} docker-${SUFFIX}) @@ -74,8 +74,8 @@ add_custom_target(run-docker ) add_custom_target(docker - COMMAND docker tag ${DOCKER_IMAGE}-app:${DOCKER_TAG} ${DOCKER_IMAGE}:${DOCKER_TAG} - COMMAND docker tag ${DOCKER_IMAGE}-app:${DOCKER_TAG} ${DOCKER_IMAGE}:latest + COMMAND docker tag ${DOCKER_IMAGE}/app:${DOCKER_TAG} ${DOCKER_IMAGE}:${DOCKER_TAG} + COMMAND docker tag ${DOCKER_IMAGE}/app:${DOCKER_TAG} ${DOCKER_IMAGE}:latest ) add_custom_target(deploy-docker DEPENDS docker-app