From 6b43fc0e83965db3ea936b21ddf0e52c09a5ddf3 Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Fri, 15 Sep 2017 17:58:11 -0300 Subject: [PATCH] Move dockerfiles to their own folder --- Dockerfile.ssh | 14 ---------- connect.ps1 | 26 ------------------- .../dind/.editorconfig | 0 .gitconfig => dockerfiles/dind/.gitconfig | 0 .inputrc => dockerfiles/dind/.inputrc | 0 .profile => dockerfiles/dind/.profile | 0 .vimrc => dockerfiles/dind/.vimrc | 0 .../dind/Dockerfile.dind | 0 .../dind/Dockerfile.dind-ee | 2 +- daemon.json => dockerfiles/dind/daemon.json | 0 .../dind/docker-prompt | 0 motd => dockerfiles/dind/motd | 0 ssh_config => dockerfiles/dind/ssh_config | 0 ucp.sh => dockerfiles/dind/ucp.sh | 3 ++- dockerfiles/dind/workshop.lic | 1 + 15 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 Dockerfile.ssh delete mode 100644 connect.ps1 rename .editorconfig => dockerfiles/dind/.editorconfig (100%) rename .gitconfig => dockerfiles/dind/.gitconfig (100%) rename .inputrc => dockerfiles/dind/.inputrc (100%) rename .profile => dockerfiles/dind/.profile (100%) rename .vimrc => dockerfiles/dind/.vimrc (100%) rename Dockerfile.dind => dockerfiles/dind/Dockerfile.dind (100%) rename Dockerfile.dind-ee => dockerfiles/dind/Dockerfile.dind-ee (95%) rename daemon.json => dockerfiles/dind/daemon.json (100%) rename docker-prompt => dockerfiles/dind/docker-prompt (100%) rename motd => dockerfiles/dind/motd (100%) rename ssh_config => dockerfiles/dind/ssh_config (100%) rename ucp.sh => dockerfiles/dind/ucp.sh (95%) create mode 100644 dockerfiles/dind/workshop.lic diff --git a/Dockerfile.ssh b/Dockerfile.ssh deleted file mode 100644 index ac00d53..0000000 --- a/Dockerfile.ssh +++ /dev/null @@ -1,14 +0,0 @@ -FROM ubuntu:16.04 - -RUN apt update \ - && apt install -y wget openssh-client \ - && wget -O powershell.deb https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.6/powershell_6.0.0-beta.6-1ubuntu1.16.04.1_amd64.deb \ - && dpkg -i powershell.deb; apt install -yf \ - && rm -f powershell.deb - -COPY ./windows /root/.ssh/id_rsa -COPY ./ssh_config /root/.ssh/config -COPY ./connect.ps1 / - - -CMD powershell -NoExit -File /connect.ps1 -endpoint ${WINDOWS_ENDPOINT} diff --git a/connect.ps1 b/connect.ps1 deleted file mode 100644 index 0bc3863..0000000 --- a/connect.ps1 +++ /dev/null @@ -1,26 +0,0 @@ -Param( - [Parameter(Mandatory=$True)] - [string]$endpoint -) - -function RegisterEvent { - if ($event) { - Unregister-Event $event - } - ($global:event = Register-ObjectEvent -InputObject $session.Runspace -EventName AvailabilityChanged -Action { - if ($session.State -eq "Broken") { - $global:session = New-PSSession -HostName $endpoint -UserName Administrator - RegisterEvent - } - if ($Host.Runspace -ne $session.Runspace) { - Enter-PSSession $session - } - }) | Out-Null -} - - -$global:session = New-PSSession -HostName $endpoint -UserName Administrator -Enter-PSSession $session -RegisterEvent - - diff --git a/.editorconfig b/dockerfiles/dind/.editorconfig similarity index 100% rename from .editorconfig rename to dockerfiles/dind/.editorconfig diff --git a/.gitconfig b/dockerfiles/dind/.gitconfig similarity index 100% rename from .gitconfig rename to dockerfiles/dind/.gitconfig diff --git a/.inputrc b/dockerfiles/dind/.inputrc similarity index 100% rename from .inputrc rename to dockerfiles/dind/.inputrc diff --git a/.profile b/dockerfiles/dind/.profile similarity index 100% rename from .profile rename to dockerfiles/dind/.profile diff --git a/.vimrc b/dockerfiles/dind/.vimrc similarity index 100% rename from .vimrc rename to dockerfiles/dind/.vimrc diff --git a/Dockerfile.dind b/dockerfiles/dind/Dockerfile.dind similarity index 100% rename from Dockerfile.dind rename to dockerfiles/dind/Dockerfile.dind diff --git a/Dockerfile.dind-ee b/dockerfiles/dind/Dockerfile.dind-ee similarity index 95% rename from Dockerfile.dind-ee rename to dockerfiles/dind/Dockerfile.dind-ee index dc54bec..5a22b7a 100644 --- a/Dockerfile.dind-ee +++ b/dockerfiles/dind/Dockerfile.dind-ee @@ -17,7 +17,7 @@ RUN rm /sbin/modprobe && echo '#!/bin/true' >/sbin/modprobe && chmod +x /sbin/mo # Install a nice vimrc file and prompt (by soulshake) COPY ["docker-prompt", "ucp.sh", "/usr/local/bin/"] -COPY [".vimrc",".profile", ".inputrc", ".gitconfig","./root/"] +COPY [".vimrc",".profile", ".inputrc", ".gitconfig", "workshop.lic", "./root/"] COPY ["motd", "/etc/motd"] COPY ["daemon.json", "/etc/docker/"] diff --git a/daemon.json b/dockerfiles/dind/daemon.json similarity index 100% rename from daemon.json rename to dockerfiles/dind/daemon.json diff --git a/docker-prompt b/dockerfiles/dind/docker-prompt similarity index 100% rename from docker-prompt rename to dockerfiles/dind/docker-prompt diff --git a/motd b/dockerfiles/dind/motd similarity index 100% rename from motd rename to dockerfiles/dind/motd diff --git a/ssh_config b/dockerfiles/dind/ssh_config similarity index 100% rename from ssh_config rename to dockerfiles/dind/ssh_config diff --git a/ucp.sh b/dockerfiles/dind/ucp.sh similarity index 95% rename from ucp.sh rename to dockerfiles/dind/ucp.sh index 975c6fc..f18d45b 100755 --- a/ucp.sh +++ b/dockerfiles/dind/ucp.sh @@ -13,8 +13,9 @@ function deploy_ucp { wait_for_url "http://localhost:2375" docker run --rm --name ucp \ -v /var/run/docker.sock:/var/run/docker.sock \ - docker/ucp:2.2.2 install --force-insecure-tcp \ + docker/ucp:2.2.3 install --force-insecure-tcp \ --san *.direct.${PWD_HOST_FQDN} \ + --license $(cat $HOME/workshop.lic) \ --admin-username admin \ --admin-password admin1234 } diff --git a/dockerfiles/dind/workshop.lic b/dockerfiles/dind/workshop.lic new file mode 100644 index 0000000..521852c --- /dev/null +++ b/dockerfiles/dind/workshop.lic @@ -0,0 +1 @@ +{"key_id":"bOY__C4AqPpQ4II47GWgozELwQRcsGfjXZkjxp3TqEHD","private_key":"OYr0Px6Yc_QrfhLAGfvVwUw1WcsTsC6w7yxZX3osbxUo","authorization":"ewogICAicGF5bG9hZCI6ICJleUpsZUhCcGNtRjBhVzl1SWpvaU1qQXhOeTB4TUMwd01WUXhOem94TkRvME1Wb2lMQ0owYjJ0bGJpSTZJbEZ4TWtzdFVVb3RkM2s0Tm04eUxWTlZXRVpPZURsMlIwUk9Xak13T0V4VldrTkJjelJtVWtGak9HYzlJaXdpYldGNFJXNW5hVzVsY3lJNk1UQXNJbk5qWVc1dWFXNW5SVzVoWW14bFpDSTZkSEoxWlN3aWJHbGpaVzV6WlZSNWNHVWlPaUpQWm1ac2FXNWxJaXdpZEdsbGNpSTZJbEJ5YjJSMVkzUnBiMjRpZlEiLAogICAic2lnbmF0dXJlcyI6IFsKICAgICAgewogICAgICAgICAiaGVhZGVyIjogewogICAgICAgICAgICAiandrIjogewogICAgICAgICAgICAgICAiZSI6ICJBUUFCIiwKICAgICAgICAgICAgICAgImtleUlEIjogIko3TEQ6NjdWUjpMNUhaOlU3QkE6Mk80Rzo0QUwzOk9GMk46SkhHQjpFRlRIOjVDVlE6TUZFTzpBRUlUIiwKICAgICAgICAgICAgICAgImtpZCI6ICJKN0xEOjY3VlI6TDVIWjpVN0JBOjJPNEc6NEFMMzpPRjJOOkpIR0I6RUZUSDo1Q1ZROk1GRU86QUVJVCIsCiAgICAgICAgICAgICAgICJrdHkiOiAiUlNBIiwKICAgICAgICAgICAgICAgIm4iOiAieWRJeS1sVTdvN1BjZVktNC1zLUNRNU9FZ0N5RjhDeEljUUlXdUs4NHBJaVpjaVk2NzMweUNZbndMU0tUbHctVTZVQ19RUmVXUmlvTU5ORTVEczVUWUVYYkdHNm9sbTJxZFdiQndjQ2ctMlVVSF9PY0I5V3VQNmdSUEhwTUZNc3hEeld3dmF5OEpVdUhnWVVMVXBtMUl2LW1xN2xwNW5RX1J4clQwS1pSQVFUWUxFTUVmR3dtM2hNT19nZUxQUy1oZ0tQdElIbGtnNl9XY294VEdvS1A3OWRfd2FIWXhHTmw3V2hTbmVpQlN4YnBiUUFLazIxbGc3OThYYjd2WnlFQVRETXJSUjlNZUU2QWRqNUhKcFkzQ295UkFQQ21hS0dSQ0s0dW9aU29JdTBoRlZsS1VQeWJidzAwMEdPLXdhMktOOFV3Z0lJbTBpNUkxdVc5R2txNHpqQnk1emhncXVVWGJHOWJXUEFPWXJxNVFhODFEeEdjQmxKeUhZQXAtRERQRTlUR2c0elltWGpKbnhacUhFZHVHcWRldlo4WE1JMHVrZmtHSUkxNHdVT2lNSUlJclhsRWNCZl80Nkk4Z1FXRHp4eWNaZV9KR1gtTEF1YXlYcnlyVUZlaFZOVWRaVWw5d1hOYUpCLWthQ3F6NVF3YVI5M3NHdy1RU2Z0RDBOdkxlN0N5T0gtRTZ2ZzZTdF9OZVR2Z3Y4WW5oQ2lYSWxaOEhPZkl3TmU3dEVGX1VjejVPYlB5a20zdHlsck5VanQwVnlBbXR0YWNWSTJpR2loY1VQcm1rNGxWSVo3VkRfTFNXLWk3eW9TdXJ0cHNQWGNlMnBLRElvMzBsSkdoT18zS1VtbDJTVVpDcXpKMXlFbUtweXNINUhEVzljc0lGQ0EzZGVBamZaVXZON1UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgICJhbGciOiAiUlMyNTYiCiAgICAgICAgIH0sCiAgICAgICAgICJzaWduYXR1cmUiOiAicktLcG9XMVhDYVYxSXdnNlR1cVNkazhuUWY2bVZoV05hSnZ0M1FKaVZwYkg3SDdnbmdUcWhmWE9BNXcyT0lkZDdTSXBYTnVhSlZ6X2JEZTJtd0VSVXVoS0ZEM1JPLWdmdWpOc2ZjcExzdVVtSmc0c1gxaHllZEQ1WXRnRHNZYzEzSDNoVUhBMHc4X1RtZWJCaWU4anFUOU1UVl9fOUNyYnpxSUs4Z0U1cVZoZmc5QXZ0WWNSVTVUeE1HUmtmOWhxU2txUjJxeHRwVTFtVUtTMURiQzc3QXZFNFZrNjc2bUR3UHdvTUVtN082Q0QyY0EyaFhsQllnYmx4Y3dFMjM4OVRPWWU0X2xQMGxzZTdSMTJpS2I0QUkwNkR4VUFFNkxwOXFLcFhEYUdLYWJEVVhMMkFIRkdBeG5pS2VqQURqMW5TUUp0dTRydFhDbEFqLXhjRC1rY2wyb1Z5cWNMM2N4VTZGdzg3VHhtdUpNYVRhejhfRW85TUZjSmcxZHhkY2NkVVVxTm5mRHlyX3E0Z01JZ1h1R2REU2RVa3lvLU41eFJVVHhubkR2eW5qTE1jNzYzUnRoY2hvajFqQzBkNmJGUHZfdnFSbTVTZDJobnFCaVRHeG54TGxPUUlhd2pMNElHTEI1bTBocWRMTTNVUUVsd1ZZNGNRNEJvNWZZclpxQ2dYN0w1OWJaX05tWHV1UmxycjlLZk5TTEFKbjA3VXAySVA4OXdKdEdJc0VQZEpSTkRrbW04RkpmQXZ0Y25WYjVWWENzZUdab2FfV0l1NEY4aVMxMDYyVmhoc1lfWjhla3RfN1h6ci1rdXJhdGhPME1KZmFBY0dsa3R1Vmp3MUdNZU9LckYwYklZSkI3ZldkaHJwVUFvM3A3VHE0RkwtQUk2anA5aHBKRk45Rk0iLAogICAgICAgICAicHJvdGVjdGVkIjogImV5Sm1iM0p0WVhSTVpXNW5kR2dpT2pFM05Dd2labTl5YldGMFZHRnBiQ0k2SW1aUklpd2lkR2x0WlNJNklqSXdNVGN0TURndE1qQlVNREk2TWpJNk1qbGFJbjAiCiAgICAgIH0KICAgXQp9"} \ No newline at end of file