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

Update files

Browse Source
This commit is contained in:
Marcos Lilljedahl
2019-04-04 13:05:44 -03:00
parent 40197c4cdf
commit 833dc559fd
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dockerfiles/dind/Dockerfile
View File

@@ -15,12 +15,15 @@ RUN mkdir -p /opt && cd /opt && \
./configure && make install LDFLAGS=-lintl && \ ./configure && make install LDFLAGS=-lintl && \
rm -rf httping-2.5 rm -rf httping-2.5
ENV COMPOSE_VERSION=1.22.0
ENV MACHINE_VERSION=v0.15.0 ENV DOCKERAPP_VERSION=v0.6.0
ENV COMPOSE_VERSION=1.23.2
# Install Compose and Machine # Install Compose and Machine
RUN pip install docker-compose==${COMPOSE_VERSION} 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
RUN curl -fsSL --output /tmp/docker-app-linux.tar.gz https://github.com/docker/app/releases/download/${DOCKERAPP_VERSION}/docker-app-linux.tar.gz \
&& tar xf "/tmp/docker-app-linux.tar.gz" -C /usr/bin/ && mv /usr/bin/docker-app-linux /usr/bin/docker-app && rm /tmp/docker-app-linux.tar.gz
# Add bash completion and set bash as default shell # Add bash completion and set bash as default shell
RUN mkdir /etc/bash_completion.d \ RUN mkdir /etc/bash_completion.d \

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

@@ -1,15 +1,15 @@
ARG VERSION=franela/docker:18.09-ee-dind ARG VERSION=franela/docker:18.09.2-ee-dind
#ARG VERSION=franela/docker:17.06.2-dind-ubuntu #ARG VERSION=franela/docker:17.06.2-dind-ubuntu
#ARG VERSION=franela/docker:18.01-dind-ubuntu #ARG VERSION=franela/docker:18.01-dind-ubuntu
FROM ${VERSION} FROM ${VERSION}
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y git tmux python-pip apache2-utils vim curl jq bash-completion tree zip \ && apt-get install -y git tmux python-pip apache2-utils vim curl jq bash-completion screen tree zip \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Add kubectl client # Add kubectl client
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.8.6/bin/linux/amd64/kubectl \ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.11.7/bin/linux/amd64/kubectl \
&& chmod +x ./kubectl \ && chmod +x ./kubectl \
&& mv ./kubectl /usr/local/bin/kubectl && mv ./kubectl /usr/local/bin/kubectl
@@ -22,7 +22,7 @@ RUN curl -L https://github.com/docker/machine/releases/download/${MACHINE_VERSIO
# Install a nice vimrc file and prompt (by soulshake) # Install a nice vimrc file and prompt (by soulshake)
COPY ["docker-prompt", "sudo", "ucp-beta.sh", "/usr/local/bin/"] COPY ["docker-prompt", "sudo", "ucp-beta.sh", "/usr/local/bin/"]
COPY [".vimrc",".profile", ".inputrc", ".gitconfig", "workshop_beta.lic", "./root/"] COPY [".vimrc",".profile", ".inputrc", ".gitconfig", "workshop_beta.lic", "ucp-config.toml", "./root/"]
COPY ["motd", "/etc/motd"] COPY ["motd", "/etc/motd"]
COPY ["ee/daemon.json", "/etc/docker/"] COPY ["ee/daemon.json", "/etc/docker/"]
COPY ["ee/cert.pem", "ee/key.pem", "/opt/pwd/certs/"] COPY ["ee/cert.pem", "ee/key.pem", "/opt/pwd/certs/"]
@@ -33,7 +33,7 @@ COPY ["ee/ucp-cert.pem", "./root/cert.pem"]
WORKDIR /root WORKDIR /root
# Setup certs and uploads folders # Setup certs and uploads folders
RUN mkdir -p /opt/pwd/certs /opt/pwd/uploads /var/lib/kubelet RUN mkdir -p /opt/pwd/certs /opt/pwd/uploads
VOLUME ["/var/lib/kubelet"] VOLUME ["/var/lib/kubelet"]
@@ -47,9 +47,9 @@ CMD cat /etc/hosts >/etc/hosts.bak && \
sed -i "s/\DOCKER_TLSKEY/$DOCKER_TLSKEY/" /etc/docker/daemon.json && \ sed -i "s/\DOCKER_TLSKEY/$DOCKER_TLSKEY/" /etc/docker/daemon.json && \
mount -t securityfs none /sys/kernel/security && \ mount -t securityfs none /sys/kernel/security && \
mount --make-rshared / && \ mount --make-rshared / && \
#mount --make-shared -t tmpfs tmpfs /run && \ #mount --make-rshared -t tmpfs tmpfs /run && \
#mount --make-shared -t tmpfs tmpfs /var/lib/kubelet && \ #mount --make-rshared /var/lib/kubelet && \
#mount --make-shared /var/lib/docker && \ #mount --make-rshared /var/lib/docker && \
dockerd > /docker.log 2>&1 & \ dockerd > /docker.log 2>&1 & \
while true ; do script -q -c "/bin/bash -l" /dev/null ; done 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 # ... and then put a shell in the foreground, restarting it if it exits

8
dockerfiles/dind/ucp.sh
View File

@@ -13,14 +13,14 @@ function deploy_ucp {
wait_for_url "https://localhost:2376" wait_for_url "https://localhost:2376"
docker run --rm -i --name ucp \ docker run --rm -i --name ucp \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
docker/ucp:3.0.5 install --debug --force-insecure-tcp \ docker/ucp:3.1.0 install --debug --force-insecure-tcp --skip-cloud-provider-check \
--san *.direct.${PWD_HOST_FQDN} \ --san *.direct.${PWD_HOST_FQDN} \
--license $(cat $HOME/workshop.lic) \ --license $(cat $HOME/workshop_beta.lic) \
--swarm-port 2375 \ --swarm-port 2375 \
--admin-username admin \ --admin-username admin \
--admin-password admin1234 --admin-password admin1234
rm $HOME/workshop.lic rm $HOME/workshop_beta.lic
echo "Finished deploying UCP" echo "Finished deploying UCP"
} }
@@ -51,7 +51,7 @@ function deploy_dtr {
local dtr_url=$(get_direct_url_from_ip $dtr_ip) local dtr_url=$(get_direct_url_from_ip $dtr_ip)
local ucp_url=$(get_direct_url_from_ip $ucp_ip) local ucp_url=$(get_direct_url_from_ip $ucp_ip)
docker run -i --rm docker/dtr:2.5.5 install \ docker run -i --rm docker/dtr:2.6.0 install \
--dtr-external-url $dtr_url \ --dtr-external-url $dtr_url \
--ucp-node $1 \ --ucp-node $1 \
--ucp-username admin \ --ucp-username admin \