fix scripts

This commit is contained in:
Pascal Vizeli 2017-03-15 11:52:04 +01:00
parent f619843f43
commit 23ebb57ac5
3 changed files with 7 additions and 4 deletions

View File

@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
software-properties-common \
&& rm -rf /var/lib/apt/lists/*
VOLUME /var/lib/docker
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
RUN apt-get update && apt-get install -y docker-ce && rm -rf /var/lib/apt/lists/*
@ -21,9 +21,7 @@ RUN apt-get update && apt-get install -y \
qemu-user-static \
binfmt-support \
&& rm -rf /var/lib/apt/lists/*
RUN mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc \
&& update-binfmts --enable qemu-arm
COPY run-docker.sh
COPY run-docker.sh /
WORKDIR /docker

0
build-scripts/docker-build-env/create_build_env.sh Normal file → Executable file
View File

5
build-scripts/docker-build-env/run-docker.sh Normal file → Executable file
View File

@ -35,6 +35,11 @@ cleanup() {
}
trap 'cleanup fail' SIGINT SIGTERM
# Start docker
echo "[INFO] Setup qemu-arm."
mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
update-binfmts --enable qemu-arm
# Start docker
echo "[INFO] Starting docker."
dockerd 2> /dev/null &