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

hacky hack is hacky

gitlab-rpi
Jordan Sokolic 2020-08-28 13:06:37 +03:00
parent bb0d259b45
commit 60bbf09508
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -41,7 +41,7 @@ build:
- sed -i -E "s@(BUILD_TAG=).+@\1$CI_IMAGE@" openwrt.conf - sed -i -E "s@(BUILD_TAG=).+@\1$CI_IMAGE@" openwrt.conf
- wget -qO- $SRC_IMAGE | gzip -d > image.img - wget -qO- $SRC_IMAGE | gzip -d > image.img
- source openwrt.conf - source openwrt.conf
- export ROOT_PW; export BUILD_TAG; ./build-rpi.sh - export ROOT_PW; export BUILD_TAG; export LOOP_ARGS="=/tmp/dev/loop0"; ./build-rpi.sh
- docker tag $CI_IMAGE $CI_IMAGE:$TAG - docker tag $CI_IMAGE $CI_IMAGE:$TAG
- docker push $CI_IMAGE:$TAG - docker push $CI_IMAGE:$TAG

2
build-rpi.sh
View File

@ -24,7 +24,7 @@ mount_rootfs() {
offset=$(sfdisk -d ${IMG} | grep "${IMG}2" | sed -E 's/.*start=\s+([0-9]+).*/\1/g') offset=$(sfdisk -d ${IMG} | grep "${IMG}2" | sed -E 's/.*start=\s+([0-9]+).*/\1/g')
tmpdir=$(mktemp -u -p .) tmpdir=$(mktemp -u -p .)
mkdir -p "${tmpdir}" mkdir -p "${tmpdir}"
mount -o loop,offset=$((512 * $offset)) -t ext4 ${IMG} ${tmpdir} mount -o loop"${LOOP_ARGS}",offset=$((512 * $offset)) -t ext4 ${IMG} ${tmpdir}
} }
docker_build() { docker_build() {