From 33229fffaf7dd9198ca7d1056e13bb426cdc2c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=CC=81=20Moreira?= Date: Mon, 17 Sep 2018 09:44:36 +0100 Subject: [PATCH] add cache --- base-image/Dockerfile | 2 ++ docker-images-builder.sh | 11 ++++++++--- image-builder/Dockerfile | 2 ++ overlays/18.0.1/feeds.conf.default | 5 +++++ package-builder/Dockerfile | 2 ++ targets/18.0.1/brcm2708-brcm2708 | 2 +- targets/18.0.1/brcm2708-brcm2709 | 2 +- targets/18.0.1/brcm2708-brcm2710 | 2 +- 8 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 overlays/18.0.1/feeds.conf.default diff --git a/base-image/Dockerfile b/base-image/Dockerfile index 3ae1fde..6e2b79a 100644 --- a/base-image/Dockerfile +++ b/base-image/Dockerfile @@ -1,5 +1,7 @@ FROM debian:8-slim LABEL MAINTAINER "Jose Moreira " +ARG VERSION +ARG TARGET RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list \ && apt-get update \ diff --git a/docker-images-builder.sh b/docker-images-builder.sh index 38298a3..f8dc475 100755 --- a/docker-images-builder.sh +++ b/docker-images-builder.sh @@ -41,7 +41,7 @@ DOCKER_IMAGE=${DOCKER_IMAGE:-$DOCKER_USERNAME/openwrt-builder} DOCKER="${DOCKER:-docker}" FORCE="${FORCE}" CLOSE_EXEC="/dev/null" -[ ! -z $VERBOSIFY ] && CLOSE_EXEC=`tty` +[ ! -z $DEBUG ] && CLOSE_EXEC=`tty` ### END - ARIABLES ### ### BEGIN - VALIDATION ### @@ -60,7 +60,7 @@ echo "## CONFIGS ##" echo "########################################" echo "# TARGETS: $TARGETS" echo "# DOCKER: $DOCKER" -echo "# VERBOSIFY: $([ -z $VERBOSIFY ] && echo "No" || echo "Yes")" +echo "# DEBUG: $([ -z $DEBUG ] && echo "No" || echo "Yes")" echo "# FORCE: $([ -z $FORCE ] && echo "No" || echo "Yes")" echo echo @@ -108,6 +108,8 @@ for TARGET in $(ls targets/${VERSION}/); do generate_dockerfile_from "${DOCKER_IMAGE}:base" ./package-builder/Dockerfile | \ $DOCKER build \ -f - \ + --build-arg VERSION="$VERSION" \ + --build-arg TARGET="$TARGET" \ --build-arg INSTALL_SRC="$INSTALL_PACKAGE_BUILDER" \ -t "${DOCKER_IMAGE}:${DOCKER_PACKAGE_BUILDER_TAG}" \ ./package-builder &> $CLOSE_EXEC \ @@ -125,7 +127,8 @@ for TARGET in $(ls targets/${VERSION}/); do generate_dockerfile_from "${DOCKER_IMAGE}:${DOCKER_PACKAGE_BUILDER_TAG}" ./package-builder-precached/Dockerfile | \ $DOCKER build \ -f - \ - --build-arg INSTALL_SRC="$INSTALL_PACKAGE_BUILDER" \ + --build-arg VERSION="$VERSION" \ + --build-arg TARGET="$TARGET" \ -t "${DOCKER_IMAGE}:${DOCKER_PACKAGE_BUILDER_PRECACHED_TAG}" \ ./package-builder-precached &> $CLOSE_EXEC \ || safeexit "${VERSION} ${TARGET} -X Error Building Package Builder Precached" 2; @@ -142,6 +145,8 @@ for TARGET in $(ls targets/${VERSION}/); do generate_dockerfile_from "${DOCKER_IMAGE}:base" ./image-builder/Dockerfile | \ $DOCKER build \ -f - \ + --build-arg VERSION="$VERSION" \ + --build-arg TARGET="$TARGET" \ --build-arg INSTALL_SRC="$INSTALL_IMAGE_BUILDER" \ -t "${DOCKER_IMAGE}:${DOCKER_IMAGE_BUILDER_TAG}" \ ./image-builder &> $CLOSE_EXEC \ diff --git a/image-builder/Dockerfile b/image-builder/Dockerfile index 637405f..87c36cc 100644 --- a/image-builder/Dockerfile +++ b/image-builder/Dockerfile @@ -1,5 +1,7 @@ FROM base LABEL MAINTAINER "Jose Moreira " +ARG VERSION +ARG TARGET ARG INSTALL_SRC RUN /bin/bash -c "$INSTALL_SRC" diff --git a/overlays/18.0.1/feeds.conf.default b/overlays/18.0.1/feeds.conf.default new file mode 100644 index 0000000..cef9b13 --- /dev/null +++ b/overlays/18.0.1/feeds.conf.default @@ -0,0 +1,5 @@ +src-git base https://git.openwrt.org/openwrt/openwrt.git;v18.06.1 +src-git packages https://git.openwrt.org/feed/packages.git^8064761a2d85588e76a8b29ceb50dd9cd307d165 +src-git luci https://git.openwrt.org/project/luci.git^f64b1523447547032d5280fb0bcdde570f2ca913 +src-git routing https://git.openwrt.org/feed/routing.git^1b9d1c419f0ecefda51922a7845ab2183d6acd76 +src-git telephony https://git.openwrt.org/feed/telephony.git^b9d7b321d15a44c5abb9e5d43a4ec78abfd9031b diff --git a/package-builder/Dockerfile b/package-builder/Dockerfile index 88b7d69..2454d5c 100644 --- a/package-builder/Dockerfile +++ b/package-builder/Dockerfile @@ -1,5 +1,7 @@ FROM base LABEL MAINTAINER "Jose Moreira " +ARG VERSION +ARG TARGET ARG INSTALL_SRC RUN /bin/bash -c "$INSTALL_SRC" diff --git a/targets/18.0.1/brcm2708-brcm2708 b/targets/18.0.1/brcm2708-brcm2708 index c706a3c..28e9032 100644 --- a/targets/18.0.1/brcm2708-brcm2708 +++ b/targets/18.0.1/brcm2708-brcm2708 @@ -4,4 +4,4 @@ OPENWRT_IMAGE_BUILDER="$OPENWRT_BASE/openwrt-imagebuilder-18.06.1-brcm2708-bcm27 OPENWRT_PACKAGE_BUILDER="$OPENWRT_BASE/openwrt-sdk-18.06.1-brcm2708-bcm2708_gcc-7.3.0_musl_eabi.Linux-x86_64.tar.xz" INSTALL_IMAGE_BUILDER="curl $OPENWRT_IMAGE_BUILDER | tar xvJf - --strip-components 1 -C /src" -INSTALL_PACKAGE_BUILDER="curl $OPENWRT_PACKAGE_BUILDER | tar xvJf - --strip-components 1 -C /src" \ No newline at end of file +INSTALL_PACKAGE_BUILDER="curl $OPENWRT_PACKAGE_BUILDER | tar xvJf - --strip-components 1 -C /src" diff --git a/targets/18.0.1/brcm2708-brcm2709 b/targets/18.0.1/brcm2708-brcm2709 index a4022ab..50c1045 100644 --- a/targets/18.0.1/brcm2708-brcm2709 +++ b/targets/18.0.1/brcm2708-brcm2709 @@ -4,4 +4,4 @@ OPENWRT_IMAGE_BUILDER="$OPENWRT_BASE/openwrt-imagebuilder-18.06.1-brcm2708-bcm27 OPENWRT_PACKAGE_BUILDER="$OPENWRT_BASE/openwrt-sdk-18.06.1-brcm2708-bcm2709_gcc-7.3.0_musl_eabi.Linux-x86_64.tar.xz" INSTALL_IMAGE_BUILDER="curl $OPENWRT_IMAGE_BUILDER | tar xvJf - --strip-components 1 -C /src" -INSTALL_PACKAGE_BUILDER="curl $OPENWRT_PACKAGE_BUILDER | tar xvJf - --strip-components 1 -C /src" \ No newline at end of file +INSTALL_PACKAGE_BUILDER="curl $OPENWRT_PACKAGE_BUILDER | tar xvJf - --strip-components 1 -C /src" diff --git a/targets/18.0.1/brcm2708-brcm2710 b/targets/18.0.1/brcm2708-brcm2710 index 7152043..296c390 100644 --- a/targets/18.0.1/brcm2708-brcm2710 +++ b/targets/18.0.1/brcm2708-brcm2710 @@ -4,4 +4,4 @@ OPENWRT_IMAGE_BUILDER="$OPENWRT_BASE/openwrt-imagebuilder-18.06.1-brcm2708-bcm27 OPENWRT_PACKAGE_BUILDER="$OPENWRT_BASE/openwrt-sdk-18.06.1-brcm2708-bcm2710_gcc-7.3.0_musl.Linux-x86_64.tar.xz" INSTALL_IMAGE_BUILDER="curl $OPENWRT_IMAGE_BUILDER | tar xvJf - --strip-components 1 -C /src" -INSTALL_PACKAGE_BUILDER="curl $OPENWRT_PACKAGE_BUILDER | tar xvJf - --strip-components 1 -C /src" \ No newline at end of file +INSTALL_PACKAGE_BUILDER="curl $OPENWRT_PACKAGE_BUILDER | tar xvJf - --strip-components 1 -C /src; "