From 336747d6a4b9112b1838e9c964fba9f4264d9fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=CC=81=20Moreira?= Date: Tue, 11 Sep 2018 12:07:15 +0100 Subject: [PATCH] add package builder precached image with heavier compiles --- .travis.yml | 2 +- docker-images-builder.sh | 18 ++++++++++++++++++ package-builder-precached/Dockerfile | 16 ++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 package-builder-precached/Dockerfile diff --git a/.travis.yml b/.travis.yml index 8b7714b..4f1e9bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ services: script: - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" - - FORCE=1 ./docker-images-builder.sh + - ./docker-images-builder.sh branches: only: diff --git a/docker-images-builder.sh b/docker-images-builder.sh index 58dc9d8..38298a3 100755 --- a/docker-images-builder.sh +++ b/docker-images-builder.sh @@ -97,6 +97,7 @@ for TARGET in $(ls targets/${VERSION}/); do source targets/${VERSION}/${TARGET} DOCKER_PACKAGE_BUILDER_TAG="package-builder_${VERSION}_${TARGET}" + DOCKER_PACKAGE_BUILDER_PRECACHED_TAG="package-builder-precached_${VERSION}_${TARGET}" DOCKER_IMAGE_BUILDER_TAG="image-builder_${VERSION}_${TARGET}" # Handle Package builder @@ -116,6 +117,23 @@ for TARGET in $(ls targets/${VERSION}/); do $DOCKER push "${DOCKER_IMAGE}:${DOCKER_PACKAGE_BUILDER_TAG}" &> $CLOSE_EXEC; fi + # Handle Package builder precached + if docker_tag_exists "${DOCKER_IMAGE}" "${DOCKER_PACKAGE_BUILDER_PRECACHED_TAG}"; then + echo "${VERSION} ${TARGET} -> Package Builder Precached already exists" + else + echo "${VERSION} ${TARGET} -> Building Package Builder Precached ..." + generate_dockerfile_from "${DOCKER_IMAGE}:${DOCKER_PACKAGE_BUILDER_TAG}" ./package-builder-precached/Dockerfile | \ + $DOCKER build \ + -f - \ + --build-arg INSTALL_SRC="$INSTALL_PACKAGE_BUILDER" \ + -t "${DOCKER_IMAGE}:${DOCKER_PACKAGE_BUILDER_PRECACHED_TAG}" \ + ./package-builder-precached &> $CLOSE_EXEC \ + || safeexit "${VERSION} ${TARGET} -X Error Building Package Builder Precached" 2; + + echo "${VERSION} ${TARGET} -> Pushing Package Builder Precached ..." + $DOCKER push "${DOCKER_IMAGE}:${DOCKER_PACKAGE_BUILDER_PRECACHED_TAG}" &> $CLOSE_EXEC; + fi + # Handle Image builder if docker_tag_exists "${DOCKER_IMAGE}" "${DOCKER_IMAGE_BUILDER_TAG}"; then echo "${VERSION} ${TARGET} -> Image Builder already exists" diff --git a/package-builder-precached/Dockerfile b/package-builder-precached/Dockerfile new file mode 100644 index 0000000..748b078 --- /dev/null +++ b/package-builder-precached/Dockerfile @@ -0,0 +1,16 @@ +FROM package-builder +LABEL MAINTAINER "Jose Moreira " + +RUN ./scripts/feeds install bzip2 +RUN ./scripts/feeds install zlib +RUN ./scripts/feeds install openzwave +RUN ./scripts/feeds install python +RUN ./scripts/feeds install perl +RUN ./scripts/feeds install node +RUN make defconfig; +RUN make package/bzip2/compile +RUN make package/zlib/compile +RUN make package/openzwave/compile +RUN make package/python/compile +RUN make package/perl/compile +RUN make package/node/compile \ No newline at end of file