Rename all docker images, and change CI integration for packaging.

Author: viferga

.gitlab-ci.yml

@@ -46,15 +46,17 @@ build:
     - $CI_PROJECT_DIR/docker-compose.sh push
   only: 
     - master
-    - tags
 
+# TODO: Implement tags correctly for Docker
 package:
   stage: package
   image:
     name: docker/compose:1.23.2
     entrypoint: [""]
   script:
     - $CI_PROJECT_DIR/docker-compose.sh pull
+    - $CI_PROJECT_DIR/docker-compose.sh build-cache
+    - $CI_PROJECT_DIR/docker-compose.sh push
     - $CI_PROJECT_DIR/docker-compose.sh pack
   artifacts:
     paths:

docker-compose.sh

@@ -42,7 +42,7 @@ sub_build() {
 	docker-compose -f docker-compose.yml build --force-rm dev
 
 	ln -sf tools/core/.dockerignore .dockerignore
-	docker-compose -f docker-compose.yml build --force-rm core
+	docker-compose -f docker-compose.yml build --force-rm runtime
 }
 
 # Build MetaCall Docker Compose with caching (link manually dockerignore files)
@@ -59,7 +59,7 @@ sub_build_cache() {
 	docker-compose -f docker-compose.yml -f docker-compose.cache.yml build --build-arg METACALL_REGISTRY=$IMAGE_REGISTRY dev
 
 	ln -sf tools/core/.dockerignore .dockerignore
-	docker-compose -f docker-compose.yml -f docker-compose.cache.yml build --build-arg METACALL_REGISTRY=$IMAGE_REGISTRY core
+	docker-compose -f docker-compose.yml -f docker-compose.cache.yml build --build-arg METACALL_REGISTRY=$IMAGE_REGISTRY runtime
 }
 
 # Push MetaCall Docker Compose
@@ -69,10 +69,10 @@ sub_push(){
 		exit 1
 	fi
 
-	docker tag metacall/core_deps:latest $IMAGE_NAME:deps
+	docker tag metacall/core:deps $IMAGE_NAME:deps
 	docker push $IMAGE_NAME:deps
 
-	docker tag metacall/core_dev:latest $IMAGE_NAME:dev
+	docker tag metacall/core:dev $IMAGE_NAME:dev
 	docker push $IMAGE_NAME:dev
 
 	docker tag metacall/core:latest $IMAGE_NAME:runtime
@@ -88,19 +88,14 @@ sub_pack(){
 		exit 1
 	fi
 
-	if [ -z "$IMAGE_NAME" ]; then
-		echo "Error: IMAGE_NAME variable not defined"
-		exit 1
-	fi
-
 	# Get path where docker-compose.sh is located
 	BASE_DIR="$(cd "$(dirname "$0")" && pwd)"
 
 	# Load default environment variables
 	. $BASE_DIR/.env
 
 	# Get layer with the tag METACALL_CLEAR_OPTIONS to hook into the previous layer of the clean command
-	DOCKER_HOOK_CLEAR=`docker image history --no-trunc $IMAGE_NAME:dev | grep 'ARG METACALL_CLEAR_OPTIONS' | awk '{print $1}'`
+	DOCKER_HOOK_CLEAR=`docker image history --no-trunc metacall/core:dev | grep 'ARG METACALL_CLEAR_OPTIONS' | awk '{print $1}'`
 
 	# Run the package builds
 	docker run --name metacall_core_pack -it $DOCKER_HOOK_CLEAR /bin/bash -c ' \

docker-compose.yml

@@ -21,7 +21,7 @@ version: "3.7"
 
 services:
   deps:
-    image: metacall/core_deps
+    image: metacall/core:deps
     container_name: metacall_core_deps
     build:
       context: .
@@ -38,7 +38,7 @@ services:
       NUGET_XMLDOC_MODE: skip
 
   dev:
-    image: metacall/core_dev
+    image: metacall/core:dev
     container_name: metacall_core_dev
     build:
       context: .
@@ -60,9 +60,9 @@ services:
     depends_on:
       - deps
 
-  core:
-    image: metacall/core
-    container_name: metacall_core
+  runtime:
+    image: metacall/core:runtime
+    container_name: metacall_core_runtime
     build:
       context: .
       dockerfile: tools/core/Dockerfile

hooks/build

@@ -19,11 +19,11 @@
 #	limitations under the License.
 #
 
-# Run docker core_deps image builder
+# Run docker deps image builder
 bash -c "cd tools/base && ./hooks/build"
 
-# Run docker core_dev image builder
+# Run docker dev image builder
 bash -c "cd tools/dev && ./hooks/build"
 
-# Run docker core image builder
+# Run docker runtime image builder
 bash -c "cd tools/core && ./hooks/build"

hooks/push

@@ -24,11 +24,11 @@ echo "[***] Push hook running"
 echo "[***]  - Tagging and pushing $DOCKER_REPO:{deps, dev, latest}"
 
 # Tag the deps image and push it
-docker tag metacall/core_deps:latest $DOCKER_REPO:deps
+docker tag metacall/core:deps $DOCKER_REPO:deps
 docker push $DOCKER_REPO:deps
 
 # Tag the dev image and push it
-docker tag metacall/core_dev:latest $DOCKER_REPO:dev
+docker tag metacall/core:dev $DOCKER_REPO:dev
 docker push $DOCKER_REPO:dev
 
 # Tag the core image and push it

tools/base/Dockerfile

@@ -21,7 +21,7 @@
 ARG METACALL_BASE_IMAGE
 
 # MetaCall Depends node image
-FROM ${METACALL_BASE_IMAGE} AS core_deps_node
+FROM ${METACALL_BASE_IMAGE} AS deps_node
 
 # Image descriptor
 LABEL copyright.name="Vicente Eduardo Ferrer Garcia" \
@@ -61,7 +61,7 @@ RUN cmake \
 	&& rm -rf $METACALL_PATH
 
 # MetaCall Depends base image
-FROM ${METACALL_BASE_IMAGE} AS core_deps
+FROM ${METACALL_BASE_IMAGE} AS deps
 
 # Image descriptor
 LABEL copyright.name="Vicente Eduardo Ferrer Garcia" \
@@ -91,7 +91,7 @@ ENV NUGET_XMLDOC_MODE=skip
 WORKDIR $METACALL_PATH
 
 # Copy MetaCall NodeJS dependencies
-COPY --from=core_deps_node /usr/local/lib/libnode.so.* /usr/local/lib/
+COPY --from=deps_node /usr/local/lib/libnode.so.* /usr/local/lib/
 
 # Copy MetaCall tool dependecies
 COPY tools/metacall-environment.sh tools/nobuildtest.patch $METACALL_TOOLS_PATH/

tools/base/hooks/env

@@ -31,4 +31,4 @@ LTTNG_UST_REGISTER_TIMEOUT=0
 NUGET_XMLDOC_MODE=skip
 
 # Override docker image
-IMAGE_NAME=metacall/core_deps
+IMAGE_NAME=metacall/core:deps

tools/core/Dockerfile

@@ -21,7 +21,7 @@
 ARG METACALL_BASE_IMAGE
 
 # MetaCall Depends builder image
-FROM metacall/core_dev AS builder
+FROM metacall/core:dev AS builder
 
 # Image descriptor
 LABEL copyright.name="Vicente Eduardo Ferrer Garcia" \

tools/dev/Dockerfile

@@ -18,7 +18,7 @@
 #
 
 # MetaCall Depends image
-FROM metacall/core_deps AS core_dev
+FROM metacall/core:deps AS dev
 
 # Image descriptor
 LABEL copyright.name="Vicente Eduardo Ferrer Garcia" \

tools/dev/hooks/env

@@ -37,4 +37,4 @@ SERIAL_LIBRARY_PATH=$METACALL_PATH/build
 DETOUR_LIBRARY_PATH=$METACALL_PATH/build
 
 # Override docker image
-IMAGE_NAME=metacall/core_dev
+IMAGE_NAME=metacall/core:dev