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

Update DTR / UCP

Browse Source
This commit is contained in:
Marcos Lilljedahl
2019-11-24 23:11:30 +00:00
parent 00e5a8f9b4
commit ce777a39a4
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,5 @@
ARG VERSION=franela/docker:18.09.2-ee-dind ARG VERSION=franela/docker:ubuntu-19.03ee
#ARG VERSION=franela/docker:17.06.2-dind-ubuntu #ARG VERSION=franela/docker:18.09.2-ee-dind
#ARG VERSION=franela/docker:18.01-dind-ubuntu
FROM ${VERSION} FROM ${VERSION}

4
dockerfiles/dind/ucp-beta.sh
View File

@@ -16,7 +16,7 @@ function deploy_ucp {
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.1.8 install --debug --force-insecure-tcp --skip-cloud-provider-check \ docker/ucp:3.2.3 install --debug --force-insecure-tcp --skip-cloud-provider-check \
--san *.direct.${PWD_HOST_FQDN} \ --san *.direct.${PWD_HOST_FQDN} \
--license $(cat $HOME/workshop_beta.lic) \ --license $(cat $HOME/workshop_beta.lic) \
--swarm-port 2375 \ --swarm-port 2375 \
@@ -55,7 +55,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.6.7 install \ docker run -i --rm docker/dtr:2.7.3 install \
--dtr-external-url $dtr_url \ --dtr-external-url $dtr_url \
--ucp-node $1 \ --ucp-node $1 \
--ucp-username admin \ --ucp-username admin \

4
dockerfiles/dind/ucp.sh
View File

@@ -13,7 +13,7 @@ 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.1.0 install --debug --force-insecure-tcp --skip-cloud-provider-check \ docker/ucp:3.2.3 install --debug --force-insecure-tcp --skip-cloud-provider-check \
--san *.direct.${PWD_HOST_FQDN} \ --san *.direct.${PWD_HOST_FQDN} \
--license $(cat $HOME/workshop_beta.lic) \ --license $(cat $HOME/workshop_beta.lic) \
--swarm-port 2375 \ --swarm-port 2375 \
@@ -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.6.0 install \ docker run -i --rm docker/dtr:2.7.3 install \
--dtr-external-url $dtr_url \ --dtr-external-url $dtr_url \
--ucp-node $1 \ --ucp-node $1 \
--ucp-username admin \ --ucp-username admin \