Docker
/
docker-openwrt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5 from oofnikj/19.07.3 

switch back to building from scratch for 19.07.3
gitlab-rpi
oofnikj 2020-05-26 09:36:32 +03:00 committed by GitHub
parent 786f28a641 ae3ab95201
commit 076e52c7d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -1,5 +1,6 @@
ARG OPENWRT_TAG FROM scratch
FROM openwrtorg/rootfs:${OPENWRT_TAG} ARG OPENWRT_SOURCE_VER
ADD openwrt-${OPENWRT_SOURCE_VER}-x86-64-generic-rootfs.tar.gz /
ARG ROOT_PW ARG ROOT_PW
RUN echo -e "${ROOT_PW}\n${ROOT_PW}" | passwd RUN echo -e "${ROOT_PW}\n${ROOT_PW}" | passwd
RUN mkdir -p /var/lock RUN mkdir -p /var/lock

4
Makefile
View File

@ -4,10 +4,12 @@ include openwrt.conf
export export
build: build:
wget -q https://downloads.openwrt.org/releases/${OPENWRT_SOURCE_VER}/targets/x86/64/openwrt-${OPENWRT_SOURCE_VER}-x86-64-generic-rootfs.tar.gz
docker build \ docker build \
--build-arg ROOT_PW \ --build-arg ROOT_PW \
--build-arg OPENWRT_TAG \ --build-arg OPENWRT_SOURCE_VER \
-t ${BUILD_TAG} . -t ${BUILD_TAG} .
rm openwrt-${OPENWRT_SOURCE_VER}-x86-64-generic-rootfs.tar.gz
build-rpi: build-rpi:
./build-rpi.sh ${RPI_SOURCE_IMG} ./build-rpi.sh ${RPI_SOURCE_IMG}

4
openwrt.conf.example
View File

@ -3,8 +3,8 @@
## general ## general
# source image for Raspberry Pi build target # source image for Raspberry Pi build target
SOURCE_IMG=openwrt-19.07.2-brcm2708-bcm2708-rpi-ext4-factory.img SOURCE_IMG=openwrt-19.07.2-brcm2708-bcm2708-rpi-ext4-factory.img
# source tag for build (x86) target # source for build (x86) target
OPENWRT_TAG=x86-64-19.07.2 OPENWRT_SOURCE_VER=19.07.3
# final tag for built Docker image # final tag for built Docker image
BUILD_TAG=openwrt BUILD_TAG=openwrt
# container name # container name