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

Fix oauth window height and update and bump dind versions

Browse Source
This commit is contained in:
Marcos Lilljedahl
2017-11-08 14:10:47 -03:00
parent c5f0f5fab9
commit a136c8516c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dockerfiles/dind/Dockerfile.dind
View File

@@ -15,8 +15,8 @@ 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.16.1 ENV COMPOSE_VERSION=1.17.0
ENV MACHINE_VERSION=v0.12.2 ENV MACHINE_VERSION=v0.13.0
# 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 \ RUN curl -L https://github.com/docker/machine/releases/download/${MACHINE_VERSION}/docker-machine-Linux-x86_64 \

3
www/landing.html
View File

@@ -105,7 +105,8 @@
$scope.login = function(provider) { $scope.login = function(provider) {
var width = screen.width*0.6; 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 x = screen.width/2 - width/2;
var y = screen.height/2 - height/2; var y = screen.height/2 - height/2;
$window.open('/oauth/providers/' + provider + '/login', 'PWDLogin', 'width='+width+',height='+height+',left='+x+',top='+y); $window.open('/oauth/providers/' + provider + '/login', 'PWDLogin', 'width='+width+',height='+height+',left='+x+',top='+y);