mirror of
https://github.com/cusspvz/openwrt-builder.docker
synced 2025-07-11 08:28:35 +00:00
add cache
This commit is contained in:
parent
336747d6a4
commit
33229fffaf
@ -1,5 +1,7 @@
|
|||||||
FROM debian:8-slim
|
FROM debian:8-slim
|
||||||
LABEL MAINTAINER "Jose Moreira <josemoreiravarzim@gmail.com>"
|
LABEL MAINTAINER "Jose Moreira <josemoreiravarzim@gmail.com>"
|
||||||
|
ARG VERSION
|
||||||
|
ARG TARGET
|
||||||
|
|
||||||
RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list \
|
RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
|
@ -41,7 +41,7 @@ DOCKER_IMAGE=${DOCKER_IMAGE:-$DOCKER_USERNAME/openwrt-builder}
|
|||||||
DOCKER="${DOCKER:-docker}"
|
DOCKER="${DOCKER:-docker}"
|
||||||
FORCE="${FORCE}"
|
FORCE="${FORCE}"
|
||||||
CLOSE_EXEC="/dev/null"
|
CLOSE_EXEC="/dev/null"
|
||||||
[ ! -z $VERBOSIFY ] && CLOSE_EXEC=`tty`
|
[ ! -z $DEBUG ] && CLOSE_EXEC=`tty`
|
||||||
### END - ARIABLES ###
|
### END - ARIABLES ###
|
||||||
|
|
||||||
### BEGIN - VALIDATION ###
|
### BEGIN - VALIDATION ###
|
||||||
@ -60,7 +60,7 @@ echo "## CONFIGS ##"
|
|||||||
echo "########################################"
|
echo "########################################"
|
||||||
echo "# TARGETS: $TARGETS"
|
echo "# TARGETS: $TARGETS"
|
||||||
echo "# DOCKER: $DOCKER"
|
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 "# FORCE: $([ -z $FORCE ] && echo "No" || echo "Yes")"
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
@ -108,6 +108,8 @@ for TARGET in $(ls targets/${VERSION}/); do
|
|||||||
generate_dockerfile_from "${DOCKER_IMAGE}:base" ./package-builder/Dockerfile | \
|
generate_dockerfile_from "${DOCKER_IMAGE}:base" ./package-builder/Dockerfile | \
|
||||||
$DOCKER build \
|
$DOCKER build \
|
||||||
-f - \
|
-f - \
|
||||||
|
--build-arg VERSION="$VERSION" \
|
||||||
|
--build-arg TARGET="$TARGET" \
|
||||||
--build-arg INSTALL_SRC="$INSTALL_PACKAGE_BUILDER" \
|
--build-arg INSTALL_SRC="$INSTALL_PACKAGE_BUILDER" \
|
||||||
-t "${DOCKER_IMAGE}:${DOCKER_PACKAGE_BUILDER_TAG}" \
|
-t "${DOCKER_IMAGE}:${DOCKER_PACKAGE_BUILDER_TAG}" \
|
||||||
./package-builder &> $CLOSE_EXEC \
|
./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 | \
|
generate_dockerfile_from "${DOCKER_IMAGE}:${DOCKER_PACKAGE_BUILDER_TAG}" ./package-builder-precached/Dockerfile | \
|
||||||
$DOCKER build \
|
$DOCKER build \
|
||||||
-f - \
|
-f - \
|
||||||
--build-arg INSTALL_SRC="$INSTALL_PACKAGE_BUILDER" \
|
--build-arg VERSION="$VERSION" \
|
||||||
|
--build-arg TARGET="$TARGET" \
|
||||||
-t "${DOCKER_IMAGE}:${DOCKER_PACKAGE_BUILDER_PRECACHED_TAG}" \
|
-t "${DOCKER_IMAGE}:${DOCKER_PACKAGE_BUILDER_PRECACHED_TAG}" \
|
||||||
./package-builder-precached &> $CLOSE_EXEC \
|
./package-builder-precached &> $CLOSE_EXEC \
|
||||||
|| safeexit "${VERSION} ${TARGET} -X Error Building Package Builder Precached" 2;
|
|| 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 | \
|
generate_dockerfile_from "${DOCKER_IMAGE}:base" ./image-builder/Dockerfile | \
|
||||||
$DOCKER build \
|
$DOCKER build \
|
||||||
-f - \
|
-f - \
|
||||||
|
--build-arg VERSION="$VERSION" \
|
||||||
|
--build-arg TARGET="$TARGET" \
|
||||||
--build-arg INSTALL_SRC="$INSTALL_IMAGE_BUILDER" \
|
--build-arg INSTALL_SRC="$INSTALL_IMAGE_BUILDER" \
|
||||||
-t "${DOCKER_IMAGE}:${DOCKER_IMAGE_BUILDER_TAG}" \
|
-t "${DOCKER_IMAGE}:${DOCKER_IMAGE_BUILDER_TAG}" \
|
||||||
./image-builder &> $CLOSE_EXEC \
|
./image-builder &> $CLOSE_EXEC \
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
FROM base
|
FROM base
|
||||||
LABEL MAINTAINER "Jose Moreira <josemoreiravarzim@gmail.com>"
|
LABEL MAINTAINER "Jose Moreira <josemoreiravarzim@gmail.com>"
|
||||||
|
ARG VERSION
|
||||||
|
ARG TARGET
|
||||||
|
|
||||||
ARG INSTALL_SRC
|
ARG INSTALL_SRC
|
||||||
RUN /bin/bash -c "$INSTALL_SRC"
|
RUN /bin/bash -c "$INSTALL_SRC"
|
||||||
|
5
overlays/18.0.1/feeds.conf.default
Normal file
5
overlays/18.0.1/feeds.conf.default
Normal file
@ -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
|
@ -1,5 +1,7 @@
|
|||||||
FROM base
|
FROM base
|
||||||
LABEL MAINTAINER "Jose Moreira <josemoreiravarzim@gmail.com>"
|
LABEL MAINTAINER "Jose Moreira <josemoreiravarzim@gmail.com>"
|
||||||
|
ARG VERSION
|
||||||
|
ARG TARGET
|
||||||
|
|
||||||
ARG INSTALL_SRC
|
ARG INSTALL_SRC
|
||||||
RUN /bin/bash -c "$INSTALL_SRC"
|
RUN /bin/bash -c "$INSTALL_SRC"
|
||||||
|
@ -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"
|
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_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"
|
INSTALL_PACKAGE_BUILDER="curl $OPENWRT_PACKAGE_BUILDER | tar xvJf - --strip-components 1 -C /src"
|
||||||
|
@ -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"
|
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_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"
|
INSTALL_PACKAGE_BUILDER="curl $OPENWRT_PACKAGE_BUILDER | tar xvJf - --strip-components 1 -C /src"
|
||||||
|
@ -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"
|
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_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"
|
INSTALL_PACKAGE_BUILDER="curl $OPENWRT_PACKAGE_BUILDER | tar xvJf - --strip-components 1 -C /src; "
|
||||||
|
Loading…
x
Reference in New Issue
Block a user