Add NodeJS back as a separated image for correct cache.

viferga · viferga · commit 3fd58343af1d · 2019-01-20T16:21:57.000-09:00
diff --git a/docker-compose.cache.yml b/docker-compose.cache.yml
@@ -20,6 +20,11 @@
 version: "3.7"
 
 services:
+  deps_node:
+    image: metacall/core:deps_node
+    build:
+      cache_from:
+        - ${IMAGE_REGISTRY}/metacall/core:deps_node
   deps:
     image: metacall/core:deps
     build:
diff --git a/docker-compose.sh b/docker-compose.sh
@@ -26,6 +26,8 @@ sub_pull() {
 		exit 1
 	fi
 
+	docker pull $IMAGE_NAME:deps_node || true
+
 	docker pull $IMAGE_NAME:deps || true
 
 	docker pull $IMAGE_NAME:dev || true
@@ -35,6 +37,9 @@ sub_pull() {
 
 # Build MetaCall Docker Compose (link manually dockerignore files)
 sub_build() {
+	ln -sf tools/node/.dockerignore .dockerignore
+	docker-compose -f docker-compose.yml build --force-rm deps_node
+
 	ln -sf tools/base/.dockerignore .dockerignore
 	docker-compose -f docker-compose.yml build --force-rm deps
 
@@ -52,6 +57,9 @@ sub_build_cache() {
 		exit 1
 	fi
 
+	ln -sf tools/node/.dockerignore .dockerignore
+	docker-compose -f docker-compose.yml -f docker-compose.cache.yml build deps_node
+
 	ln -sf tools/base/.dockerignore .dockerignore
 	docker-compose -f docker-compose.yml -f docker-compose.cache.yml build deps
 
@@ -69,6 +77,10 @@ sub_push(){
 		exit 1
 	fi
 
+	# Push deps_node image
+	docker tag metacall/core:deps_node $IMAGE_NAME:deps_node
+	docker push $IMAGE_NAME:deps_node
+
 	# Push deps image
 	docker tag metacall/core:deps $IMAGE_NAME:deps
 	docker push $IMAGE_NAME:deps
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,6 +20,19 @@
 version: "3.7"
 
 services:
+  deps_node:
+    image: metacall/core:deps_node
+    container_name: metacall_core_deps_node
+    build:
+      context: .
+      dockerfile: tools/node/Dockerfile
+      args:
+        METACALL_BASE_IMAGE: $METACALL_BASE_IMAGE
+        METACALL_PATH: $METACALL_PATH
+        METACALL_NODE_BUILD_TYPE: $METACALL_NODE_BUILD_TYPE
+    environment:
+      DEBIAN_FRONTEND: noninteractive
+
   deps:
     image: metacall/core:deps
     container_name: metacall_core_deps
@@ -29,13 +42,14 @@ services:
       args:
         METACALL_BASE_IMAGE: $METACALL_BASE_IMAGE
         METACALL_PATH: $METACALL_PATH
-        METACALL_NODE_BUILD_TYPE: $METACALL_NODE_BUILD_TYPE
         METACALL_TOOLS_PATH: $METACALL_PATH/tools
         METACALL_INSTALL_OPTIONS: root base python ruby netcore v8rep51 nodejs rapidjson funchook pack
     environment:
       DEBIAN_FRONTEND: noninteractive
       LTTNG_UST_REGISTER_TIMEOUT: 0
       NUGET_XMLDOC_MODE: skip
+    depends_on:
+      - deps_node
 
   dev:
     image: metacall/core:dev
diff --git a/hooks/build b/hooks/build
@@ -19,6 +19,9 @@
 #	limitations under the License.
 #
 
+# Run docker deps_node image builder
+bash -c "cd tools/node && ./hooks/build"
+
 # Run docker deps image builder
 bash -c "cd tools/base && ./hooks/build"
 
diff --git a/hooks/env b/hooks/env
@@ -23,9 +23,9 @@
 source ../../.env
 
 # These values are passed by the Hub, but if we are running locally we can get them
-[ -n "$SOURCE_TYPE" ]		|| SOURCE_TYPE=git
-[ -n "$SOURCE_BRANCH" ]		|| SOURCE_BRANCH=$(git symbolic-ref -q --short HEAD)
-[ -n "$GIT_SHA1" ]			|| GIT_SHA1=$(git rev-parse -q HEAD)
+[ -n "$SOURCE_TYPE" ] || SOURCE_TYPE=git
+[ -n "$SOURCE_BRANCH" ] || SOURCE_BRANCH=$(git symbolic-ref -q --short HEAD)
+[ -n "$GIT_SHA1" ] || GIT_SHA1=$(git rev-parse -q HEAD)
 
 if [[ "${SOURCE_BRANCH/-*/}" =~ ^[0-9][0-9.]*$ ]]; then
 	VERSION=${SOURCE_BRANCH/-*/}
diff --git a/hooks/pre_build b/hooks/pre_build
@@ -19,11 +19,14 @@
 #	limitations under the License.
 #
 
-# Pull docker core_deps image
-docker pull registry.hub.docker.com/metacall/core:deps		|| true
+# Pull docker deps_node image
+docker pull registry.hub.docker.com/metacall/core:deps_node || true
 
-# Pull docker core_dev image
-docker pull registry.hub.docker.com/metacall/core:dev		|| true
+# Pull docker deps image
+docker pull registry.hub.docker.com/metacall/core:deps || true
 
-# Run docker core image builder
-docker pull registry.hub.docker.com/metacall/core:runtime	|| true
+# Pull docker dev image
+docker pull registry.hub.docker.com/metacall/core:dev || true
+
+# Run docker runtime image builder
+docker pull registry.hub.docker.com/metacall/core:runtime || true
diff --git a/hooks/push b/hooks/push
@@ -21,7 +21,11 @@
 
 # Show message
 echo "[***] Push hook running"
-echo "[***]  - Tagging and pushing $DOCKER_REPO:{deps, dev, latest}"
+echo "[***]  - Tagging and pushing $DOCKER_REPO:{deps_node, deps, dev, latest}"
+
+# Tag the deps_node image and push it
+docker tag metacall/core:deps_node $DOCKER_REPO:deps_node
+docker push $DOCKER_REPO:deps_node
 
 # Tag the deps image and push it
 docker tag metacall/core:deps $DOCKER_REPO:deps
diff --git a/tools/base/.dockerignore b/tools/base/.dockerignore
@@ -1,5 +1,3 @@
 **
 !tools/metacall-environment.sh
 !tools/nobuildtest.patch
-!tools/metacall-clear.sh
-!cmake/FindNodeJS.cmake
diff --git a/tools/base/Dockerfile b/tools/base/Dockerfile
@@ -21,44 +21,7 @@
 ARG METACALL_BASE_IMAGE
 
 # MetaCall Depends node image
-FROM ${METACALL_BASE_IMAGE} AS deps_node
-
-# Image descriptor
-LABEL copyright.name="Vicente Eduardo Ferrer Garcia" \
-	copyright.address="vic798@gmail.com" \
-	maintainer.name="Vicente Eduardo Ferrer Garcia" \
-	maintainer.address="vic798@gmail.com" \
-	vendor="MetaCall Inc." \
-	version="0.1"
-
-# Arguments
-ARG METACALL_PATH
-
-# Environment variables
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Define working directory
-WORKDIR $METACALL_PATH
-
-# Copy MetaCall environment script
-COPY tools/metacall-environment.sh tools/metacall-clear.sh $METACALL_PATH/tools/
-
-# Install build dependencies
-RUN tools/metacall-environment.sh root base nodejs
-
-# Copy MetaCall NodeJS cmake script
-COPY cmake/FindNodeJS.cmake $METACALL_PATH/cmake/FindNodeJS.cmake
-
-# Run NodeJS cmake script (TODO: Make find library prefixes/suffixes generic)
-ARG METACALL_NODE_BUILD_TYPE
-
-RUN cmake \
-		-DCMAKE_BUILD_TYPE=${METACALL_NODE_BUILD_TYPE} \
-		-DCMAKE_FIND_LIBRARY_PREFIXES=lib \
-		-DCMAKE_FIND_LIBRARY_SUFFIXES=".a;.so" \
-		-P $METACALL_PATH/cmake/FindNodeJS.cmake \
-	&& tools/metacall-clear.sh root base nodejs \
-	&& rm -rf $METACALL_PATH
+FROM metacall/core_deps:node AS deps_node
 
 # MetaCall Depends base image
 FROM ${METACALL_BASE_IMAGE} AS deps
diff --git a/tools/base/hooks/build b/tools/base/hooks/build
@@ -37,12 +37,12 @@ ln -sf "`pwd`/.dockerignore" ../../.dockerignore
 # 	--build-arg "SOURCE_TYPE=$SOURCE_TYPE" \
 # 	${VERSION:+--build-arg "VERSION=$VERSION"} \
 
-# Build base image
+# Build deps image
 docker build \
+	--cache-from registry.hub.docker.com/metacall/core:deps_node \
 	--cache-from registry.hub.docker.com/metacall/core:deps \
 	--build-arg "METACALL_BASE_IMAGE=$METACALL_BASE_IMAGE" \
 	--build-arg "METACALL_PATH=$METACALL_PATH" \
-	--build-arg "METACALL_NODE_BUILD_TYPE=$METACALL_NODE_BUILD_TYPE" \
 	--build-arg "METACALL_TOOLS_PATH=$METACALL_PATH/tools" \
 	--build-arg "METACALL_INSTALL_OPTIONS=$METACALL_INSTALL_OPTIONS" \
 	-t $IMAGE_NAME \
diff --git a/tools/node/.dockerignore b/tools/node/.dockerignore
@@ -0,0 +1,4 @@
+**
+!tools/metacall-environment.sh
+!tools/metacall-clear.sh
+!cmake/FindNodeJS.cmake
diff --git a/tools/node/Dockerfile b/tools/node/Dockerfile
@@ -0,0 +1,61 @@
+#
+#	MetaCall Library by Parra Studios
+#	Docker image infrastructure for MetaCall.
+#
+#	Copyright (C) 2016 - 2019 Vicente Eduardo Ferrer Garcia <vic798@gmail.com>
+#
+#	Licensed under the Apache License, Version 2.0 (the "License");
+#	you may not use this file except in compliance with the License.
+#	You may obtain a copy of the License at
+#
+#		http://www.apache.org/licenses/LICENSE-2.0
+#
+#	Unless required by applicable law or agreed to in writing, software
+#	distributed under the License is distributed on an "AS IS" BASIS,
+#	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#	See the License for the specific language governing permissions and
+#	limitations under the License.
+#
+
+# Configure MetaCall Depends node image
+ARG METACALL_BASE_IMAGE
+
+# MetaCall Depends node image
+FROM ${METACALL_BASE_IMAGE} AS deps_node
+
+# Image descriptor
+LABEL copyright.name="Vicente Eduardo Ferrer Garcia" \
+	copyright.address="vic798@gmail.com" \
+	maintainer.name="Vicente Eduardo Ferrer Garcia" \
+	maintainer.address="vic798@gmail.com" \
+	vendor="MetaCall Inc." \
+	version="0.1"
+
+# Arguments
+ARG METACALL_PATH
+
+# Environment variables
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Define working directory
+WORKDIR $METACALL_PATH
+
+# Copy MetaCall environment script
+COPY tools/metacall-environment.sh tools/metacall-clear.sh $METACALL_PATH/tools/
+
+# Install build dependencies
+RUN tools/metacall-environment.sh root base nodejs
+
+# Copy MetaCall NodeJS cmake script
+COPY cmake/FindNodeJS.cmake $METACALL_PATH/cmake/FindNodeJS.cmake
+
+# Run NodeJS cmake script (TODO: Make find library prefixes/suffixes generic)
+ARG METACALL_NODE_BUILD_TYPE
+
+RUN cmake \
+		-DCMAKE_BUILD_TYPE=${METACALL_NODE_BUILD_TYPE} \
+		-DCMAKE_FIND_LIBRARY_PREFIXES=lib \
+		-DCMAKE_FIND_LIBRARY_SUFFIXES=".a;.so" \
+		-P $METACALL_PATH/cmake/FindNodeJS.cmake \
+	&& tools/metacall-clear.sh root base nodejs \
+	&& rm -rf $METACALL_PATH
diff --git a/tools/node/hooks/build b/tools/node/hooks/build
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+#
+#	MetaCall Build Bash Script by Parra Studios
+#	Build and install bash script utility for MetaCall.
+#
+#	Copyright (C) 2016 - 2019 Vicente Eduardo Ferrer Garcia <vic798@gmail.com>
+#
+#	Licensed under the Apache License, Version 2.0 (the "License");
+#	you may not use this file except in compliance with the License.
+#	You may obtain a copy of the License at
+#
+#		http://www.apache.org/licenses/LICENSE-2.0
+#
+#	Unless required by applicable law or agreed to in writing, software
+#	distributed under the License is distributed on an "AS IS" BASIS,
+#	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#	See the License for the specific language governing permissions and
+#	limitations under the License.
+#
+
+# Load environment variables
+source ./hooks/env
+
+# Show message
+echo "[***] Build hook running"
+echo "[***]  - Building $IMAGE_NAME from dockerfile $DOCKERFILE_PATH"
+echo "[***]  - Running build script from `pwd`"
+
+# Link docker ignore for the context
+ln -sf "`pwd`/.dockerignore" ../../.dockerignore
+
+# TODO
+# 	--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+# 	--build-arg "SOURCE_COMMIT=$GIT_SHA1" \
+# 	--build-arg "DOCKERFILE_PATH=$DOCKERFILE_PATH" \
+# 	--build-arg "SOURCE_TYPE=$SOURCE_TYPE" \
+# 	${VERSION:+--build-arg "VERSION=$VERSION"} \
+
+# Build node image
+docker build \
+	--cache-from registry.hub.docker.com/metacall/core:deps_node \
+	--build-arg "METACALL_BASE_IMAGE=$METACALL_BASE_IMAGE" \
+	--build-arg "METACALL_PATH=$METACALL_PATH" \
+	--build-arg "METACALL_NODE_BUILD_TYPE=$METACALL_NODE_BUILD_TYPE" \
+	-t $IMAGE_NAME \
+	-f $DOCKERFILE_PATH ../..
diff --git a/tools/node/hooks/env b/tools/node/hooks/env
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+#
+#	MetaCall Build Bash Script by Parra Studios
+#	Build and install bash script utility for MetaCall.
+#
+#	Copyright (C) 2016 - 2019 Vicente Eduardo Ferrer Garcia <vic798@gmail.com>
+#
+#	Licensed under the Apache License, Version 2.0 (the "License");
+#	you may not use this file except in compliance with the License.
+#	You may obtain a copy of the License at
+#
+#		http://www.apache.org/licenses/LICENSE-2.0
+#
+#	Unless required by applicable law or agreed to in writing, software
+#	distributed under the License is distributed on an "AS IS" BASIS,
+#	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#	See the License for the specific language governing permissions and
+#	limitations under the License.
+#
+
+# Load common environment variables
+source ../../hooks/env
+
+# Node environment variables
+DEBIAN_FRONTEND=noninteractive
+
+# Override docker image
+IMAGE_NAME=metacall/core:deps_node

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@`
`19`	`19`	`# limitations under the License.`
`20`	`20`	`#`
`21`	`21`
	`22`	`+# Run docker deps_node image builder`
	`23`	`+bash -c "cd tools/node && ./hooks/build"`
	`24`	`+`
`22`	`25`	`# Run docker deps image builder`
`23`	`26`	`bash -c "cd tools/base && ./hooks/build"`
`24`	`27`