diff --git a/dockerfiles/dind/Dockerfile.dind b/dockerfiles/dind/Dockerfile.dind index 81060c8..cee6299 100644 --- a/dockerfiles/dind/Dockerfile.dind +++ b/dockerfiles/dind/Dockerfile.dind @@ -15,8 +15,8 @@ RUN mkdir -p /opt && cd /opt && \ ./configure && make install LDFLAGS=-lintl && \ rm -rf httping-2.5 -ENV COMPOSE_VERSION=1.16.1 -ENV MACHINE_VERSION=v0.12.2 +ENV COMPOSE_VERSION=1.17.0 +ENV MACHINE_VERSION=v0.13.0 # Install Compose and Machine RUN pip install docker-compose==${COMPOSE_VERSION} RUN curl -L https://github.com/docker/machine/releases/download/${MACHINE_VERSION}/docker-machine-Linux-x86_64 \ diff --git a/www/landing.html b/www/landing.html index 82bcbdc..0579fa1 100644 --- a/www/landing.html +++ b/www/landing.html @@ -105,7 +105,8 @@ $scope.login = function(provider) { var width = screen.width*0.6; - var height = screen.height*0.6; + // fixed height as the login window is not responsive + var height = 620; var x = screen.width/2 - width/2; var y = screen.height/2 - height/2; $window.open('/oauth/providers/' + provider + '/login', 'PWDLogin', 'width='+width+',height='+height+',left='+x+',top='+y);