epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dockerfiles

Browse Source
This commit is contained in:
Marcos Lilljedahl
2018-11-04 20:20:01 -03:00
parent 9d44ff74de
commit b938e644c3
5 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dockerfiles/dind/Dockerfile.dind-ee
View File

@@ -1,14 +1,23 @@
ARG VERSION=franela/docker:18.01-dind-ubuntu
ARG VERSION=franela/docker:18.09-ee-dind
#ARG VERSION=franela/docker:17.06.2-dind-ubuntu
#ARG VERSION=franela/docker:18.01-dind-ubuntu
FROM ${VERSION}
RUN apt-get update \
&& apt-get install -y git tmux apache2-utils vim curl jq bash-completion tree zip \
&& apt-get install -y git tmux python-pip apache2-utils vim curl jq bash-completion tree zip \
&& rm -rf /var/lib/apt/lists/*
# Add kubectl client
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.8.6/bin/linux/amd64/kubectl \
&& chmod +x ./kubectl \
&& mv ./kubectl /usr/local/bin/kubectl
ENV COMPOSE_VERSION=1.22.0
RUN pip install docker-compose==${COMPOSE_VERSION}
RUN curl -L https://github.com/docker/machine/releases/download/${MACHINE_VERSION}/docker-machine-Linux-x86_64 \
-o /usr/bin/docker-machine && chmod +x /usr/bin/docker-machine
# Install a nice vimrc file and prompt (by soulshake)
@@ -16,9 +25,9 @@ COPY ["docker-prompt", "sudo", "ucp-beta.sh", "/usr/local/bin/"]
COPY [".vimrc",".profile", ".inputrc", ".gitconfig", "workshop_beta.lic", "./root/"]
COPY ["motd", "/etc/motd"]
COPY ["ee/daemon.json", "/etc/docker/"]
COPY ["ee/cert.pem", "/opt/pwd/certs/"]
COPY ["ee/key.pem", "/opt/pwd/certs/"]
COPY ["ee/config.json", "/root/.docker/"]
COPY ["ee/cert.pem", "ee/key.pem", "/opt/pwd/certs/"]
COPY ["ee/ucp-key.pem", "./root/key.pem"]
COPY ["ee/ucp-cert.pem", "./root/cert.pem"]
# Move to our home
WORKDIR /root
@@ -26,6 +35,8 @@ WORKDIR /root
# Setup certs and uploads folders
RUN mkdir -p /opt/pwd/certs /opt/pwd/uploads /var/lib/kubelet
VOLUME ["/var/lib/kubelet"]
# Remove IPv6 alias for localhost and start docker in the background ...
CMD cat /etc/hosts >/etc/hosts.bak && \
sed 's/^::1.*//' /etc/hosts.bak > /etc/hosts && \
@@ -35,8 +46,10 @@ CMD cat /etc/hosts >/etc/hosts.bak && \
sed -i "s/\DOCKER_TLSCERT/$DOCKER_TLSCERT/" /etc/docker/daemon.json && \
sed -i "s/\DOCKER_TLSKEY/$DOCKER_TLSKEY/" /etc/docker/daemon.json && \
mount -t securityfs none /sys/kernel/security && \
mount --make-shared -t tmpfs tmpfs /run && \
mount --make-shared -t tmpfs tmpfs /var/lib/kubelet && \
mount --make-rshared / && \
#mount --make-shared -t tmpfs tmpfs /run && \
#mount --make-shared -t tmpfs tmpfs /var/lib/kubelet && \
#mount --make-shared /var/lib/docker && \
dockerd > /docker.log 2>&1 & \
while true ; do script -q -c "/bin/bash -l" /dev/null ; done
# ... and then put a shell in the foreground, restarting it if it exits