diff --git a/dockerfiles/dind/Dockerfile.dind-ee b/dockerfiles/dind/Dockerfile.dind-ee index c47df51..b7e7da0 100644 --- a/dockerfiles/dind/Dockerfile.dind-ee +++ b/dockerfiles/dind/Dockerfile.dind-ee @@ -1,6 +1,5 @@ -ARG VERSION=franela/docker:18.09.2-ee-dind -#ARG VERSION=franela/docker:17.06.2-dind-ubuntu -#ARG VERSION=franela/docker:18.01-dind-ubuntu +ARG VERSION=franela/docker:ubuntu-19.03ee +#ARG VERSION=franela/docker:18.09.2-ee-dind FROM ${VERSION} diff --git a/dockerfiles/dind/ucp-beta.sh b/dockerfiles/dind/ucp-beta.sh index 24ac92d..33b9c1b 100755 --- a/dockerfiles/dind/ucp-beta.sh +++ b/dockerfiles/dind/ucp-beta.sh @@ -16,7 +16,7 @@ function deploy_ucp { docker run --rm -i --name ucp \ -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} \ --license $(cat $HOME/workshop_beta.lic) \ --swarm-port 2375 \ @@ -55,7 +55,7 @@ function deploy_dtr { local dtr_url=$(get_direct_url_from_ip $dtr_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 \ --ucp-node $1 \ --ucp-username admin \ diff --git a/dockerfiles/dind/ucp.sh b/dockerfiles/dind/ucp.sh index d5ccd79..9a6ce41 100755 --- a/dockerfiles/dind/ucp.sh +++ b/dockerfiles/dind/ucp.sh @@ -13,7 +13,7 @@ function deploy_ucp { wait_for_url "https://localhost:2376" docker run --rm -i --name ucp \ -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} \ --license $(cat $HOME/workshop_beta.lic) \ --swarm-port 2375 \ @@ -51,7 +51,7 @@ function deploy_dtr { local dtr_url=$(get_direct_url_from_ip $dtr_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 \ --ucp-node $1 \ --ucp-username admin \