bj/torch-pi-gen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Docker build: move to debian stretch

Browse Source
This commit is contained in:
Claus Strasburger 2017-07-17 12:05:07 +02:00 committed by XECDesign
parent 4d65b2b357
commit bab0fe3b0d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,10 +1,10 @@
FROM debian:jessie FROM debian:stretch
RUN apt-get -y update && \ RUN apt-get -y update && \
apt-get -y install \ apt-get -y install \
git vim parted \ git vim parted \
quilt realpath qemu-user-static debootstrap zerofree pxz zip dosfstools \ quilt realpath qemu-user-static debootstrap zerofree pxz zip dosfstools \
bsdtar libcap2-bin rsync grep \ bsdtar libcap2-bin rsync grep udev \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY . /pi-gen/ COPY . /pi-gen/

7
build-docker.sh
View File

@ -12,9 +12,10 @@ if ! $DOCKER ps >/dev/null; then
fi fi
set -e set -e
config_mount="/dev/null:/dev/null"
config_mount=()
if [ -f config ]; then if [ -f config ]; then
config_mount="$(pwd)/config:/pi-gen/config:ro" config_mount=("-v" "$(pwd)/config:/pi-gen/config:ro")
source config source config
fi fi
@ -65,7 +66,7 @@ else
$DOCKER run --name "${CONTAINER_NAME}" --privileged \ $DOCKER run --name "${CONTAINER_NAME}" --privileged \
-e IMG_NAME=${IMG_NAME}\ -e IMG_NAME=${IMG_NAME}\
-v "$(pwd)/deploy:/pi-gen/deploy" \ -v "$(pwd)/deploy:/pi-gen/deploy" \
-v "${config_mount}" \ "${config_mount[@]}" \
pi-gen \ pi-gen \
bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static && bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
cd /pi-gen; ./build.sh && cd /pi-gen; ./build.sh &&