ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-21 02:01:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dind: add docker 1.10.3

Browse Source
This commit is contained in:
Kostas Lekkas 2016-06-23 17:22:23 +03:00
parent 87be94f2d4
commit ab1ed3e681
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/dind/Dockerfile
View File

@ -1,4 +1,4 @@
FROM resin/resin-base:1
FROM resin/resin-base:2
VOLUME /var/lib/docker
VOLUME /resin-data
@ -9,14 +9,18 @@ RUN apt-get update \
rsync \
&& rm -rf /var/lib/apt/lists/*
ENV DOCKER_VERSION 1.6.2
ENV DOCKER_VERSION 1.10.3
ENV RELEASE_NAME jessie
# From get.docker.com script
RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 \
&& echo deb https://get.docker.com/ubuntu docker main > /etc/apt/sources.list.d/docker.list \
&& apt-get update && apt-get install -y lxc-docker-${DOCKER_VERSION} \
RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D \
&& echo deb https://apt.dockerproject.org/repo debian-${RELEASE_NAME} main > /etc/apt/sources.list.d/docker.list \
&& apt-get update || true \
&& apt-get --force-yes install docker-engine=${DOCKER_VERSION}-0~${RELEASE_NAME} \
&& rm -rf /var/lib/apt/lists/*
# Change os release to a resin-sync compatible one
RUN sed -i 's/\(PRETTY_NAME=\).*/\1"ResinOS 1.2.1+dind"/' /etc/os-release
COPY config/openvpn/ /etc/openvpn/
COPY config/services/ /etc/systemd/system/
COPY resin-vars vpn-init /usr/src/app/

2
tools/dind/config/services/docker.service.d/overlayfs.conf
View File

@ -1,3 +1,3 @@
[Service]
ExecStart=
ExecStart=/usr/bin/docker -s overlay -d -H fd://
ExecStart=/usr/bin/docker daemon --storage-driver overlay --host=fd://