Fix oauth window height and update and bump dind versions
This commit is contained in:
@@ -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 \
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user