Move dockerfiles to their own folder

ppattern · Sep 15, 2017 · 6b43fc0 · 6b43fc0
1 parent 23d0d8e
commit 6b43fc0
Showing 15 changed files with 4 additions and 42 deletions.
diff --git a/Dockerfile.ssh b/Dockerfile.ssh
diff --git a/connect.ps1 b/connect.ps1
diff --git a/.editorconfig → dockerfiles/dind/.editorconfig b/.editorconfig → dockerfiles/dind/.editorconfig
diff --git a/.gitconfig → dockerfiles/dind/.gitconfig b/.gitconfig → dockerfiles/dind/.gitconfig
diff --git a/.inputrc → dockerfiles/dind/.inputrc b/.inputrc → dockerfiles/dind/.inputrc
diff --git a/.profile → dockerfiles/dind/.profile b/.profile → dockerfiles/dind/.profile
diff --git a/.vimrc → dockerfiles/dind/.vimrc b/.vimrc → dockerfiles/dind/.vimrc
diff --git a/Dockerfile.dind → dockerfiles/dind/Dockerfile.dind b/Dockerfile.dind → dockerfiles/dind/Dockerfile.dind
diff --git a/Dockerfile.dind-ee → dockerfiles/dind/Dockerfile.dind-ee b/Dockerfile.dind-ee → 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 → dockerfiles/dind/daemon.json b/daemon.json → dockerfiles/dind/daemon.json
diff --git a/docker-prompt → dockerfiles/dind/docker-prompt b/docker-prompt → dockerfiles/dind/docker-prompt
diff --git a/motd → dockerfiles/dind/motd b/motd → dockerfiles/dind/motd
diff --git a/ssh_config → dockerfiles/dind/ssh_config b/ssh_config → dockerfiles/dind/ssh_config
diff --git a/ucp.sh → dockerfiles/dind/ucp.sh b/ucp.sh → 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
@@ -0,0 +1 @@
+{"key_id":"bOY__C4AqPpQ4II47GWgozELwQRcsGfjXZkjxp3TqEHD","private_key":"OYr0Px6Yc_QrfhLAGfvVwUw1WcsTsC6w7yxZX3osbxUo","authorization":"ewogICAicGF5bG9hZCI6ICJleUpsZUhCcGNtRjBhVzl1SWpvaU1qQXhOeTB4TUMwd01WUXhOem94TkRvME1Wb2lMQ0owYjJ0bGJpSTZJbEZ4TWtzdFVVb3RkM2s0Tm04eUxWTlZXRVpPZURsMlIwUk9Xak13T0V4VldrTkJjelJtVWtGak9HYzlJaXdpYldGNFJXNW5hVzVsY3lJNk1UQXNJbk5qWVc1dWFXNW5SVzVoWW14bFpDSTZkSEoxWlN3aWJHbGpaVzV6WlZSNWNHVWlPaUpQWm1ac2FXNWxJaXdpZEdsbGNpSTZJbEJ5YjJSMVkzUnBiMjRpZlEiLAogICAic2lnbmF0dXJlcyI6IFsKICAgICAgewogICAgICAgICAiaGVhZGVyIjogewogICAgICAgICAgICAiandrIjogewogICAgICAgICAgICAgICAiZSI6ICJBUUFCIiwKICAgICAgICAgICAgICAgImtleUlEIjogIko3TEQ6NjdWUjpMNUhaOlU3QkE6Mk80Rzo0QUwzOk9GMk46SkhHQjpFRlRIOjVDVlE6TUZFTzpBRUlUIiwKICAgICAgICAgICAgICAgImtpZCI6ICJKN0xEOjY3VlI6TDVIWjpVN0JBOjJPNEc6NEFMMzpPRjJOOkpIR0I6RUZUSDo1Q1ZROk1GRU86QUVJVCIsCiAgICAgICAgICAgICAgICJrdHkiOiAiUlNBIiwKICAgICAgICAgICAgICAgIm4iOiAieWRJeS1sVTdvN1BjZVktNC1zLUNRNU9FZ0N5RjhDeEljUUlXdUs4NHBJaVpjaVk2NzMweUNZbndMU0tUbHctVTZVQ19RUmVXUmlvTU5ORTVEczVUWUVYYkdHNm9sbTJxZFdiQndjQ2ctMlVVSF9PY0I5V3VQNmdSUEhwTUZNc3hEeld3dmF5OEpVdUhnWVVMVXBtMUl2LW1xN2xwNW5RX1J4clQwS1pSQVFUWUxFTUVmR3dtM2hNT19nZUxQUy1oZ0tQdElIbGtnNl9XY294VEdvS1A3OWRfd2FIWXhHTmw3V2hTbmVpQlN4YnBiUUFLazIxbGc3OThYYjd2WnlFQVRETXJSUjlNZUU2QWRqNUhKcFkzQ295UkFQQ21hS0dSQ0s0dW9aU29JdTBoRlZsS1VQeWJidzAwMEdPLXdhMktOOFV3Z0lJbTBpNUkxdVc5R2txNHpqQnk1emhncXVVWGJHOWJXUEFPWXJxNVFhODFEeEdjQmxKeUhZQXAtRERQRTlUR2c0elltWGpKbnhacUhFZHVHcWRldlo4WE1JMHVrZmtHSUkxNHdVT2lNSUlJclhsRWNCZl80Nkk4Z1FXRHp4eWNaZV9KR1gtTEF1YXlYcnlyVUZlaFZOVWRaVWw5d1hOYUpCLWthQ3F6NVF3YVI5M3NHdy1RU2Z0RDBOdkxlN0N5T0gtRTZ2ZzZTdF9OZVR2Z3Y4WW5oQ2lYSWxaOEhPZkl3TmU3dEVGX1VjejVPYlB5a20zdHlsck5VanQwVnlBbXR0YWNWSTJpR2loY1VQcm1rNGxWSVo3VkRfTFNXLWk3eW9TdXJ0cHNQWGNlMnBLRElvMzBsSkdoT18zS1VtbDJTVVpDcXpKMXlFbUtweXNINUhEVzljc0lGQ0EzZGVBamZaVXZON1UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgICJhbGciOiAiUlMyNTYiCiAgICAgICAgIH0sCiAgICAgICAgICJzaWduYXR1cmUiOiAicktLcG9XMVhDYVYxSXdnNlR1cVNkazhuUWY2bVZoV05hSnZ0M1FKaVZwYkg3SDdnbmdUcWhmWE9BNXcyT0lkZDdTSXBYTnVhSlZ6X2JEZTJtd0VSVXVoS0ZEM1JPLWdmdWpOc2ZjcExzdVVtSmc0c1gxaHllZEQ1WXRnRHNZYzEzSDNoVUhBMHc4X1RtZWJCaWU4anFUOU1UVl9fOUNyYnpxSUs4Z0U1cVZoZmc5QXZ0WWNSVTVUeE1HUmtmOWhxU2txUjJxeHRwVTFtVUtTMURiQzc3QXZFNFZrNjc2bUR3UHdvTUVtN082Q0QyY0EyaFhsQllnYmx4Y3dFMjM4OVRPWWU0X2xQMGxzZTdSMTJpS2I0QUkwNkR4VUFFNkxwOXFLcFhEYUdLYWJEVVhMMkFIRkdBeG5pS2VqQURqMW5TUUp0dTRydFhDbEFqLXhjRC1rY2wyb1Z5cWNMM2N4VTZGdzg3VHhtdUpNYVRhejhfRW85TUZjSmcxZHhkY2NkVVVxTm5mRHlyX3E0Z01JZ1h1R2REU2RVa3lvLU41eFJVVHhubkR2eW5qTE1jNzYzUnRoY2hvajFqQzBkNmJGUHZfdnFSbTVTZDJobnFCaVRHeG54TGxPUUlhd2pMNElHTEI1bTBocWRMTTNVUUVsd1ZZNGNRNEJvNWZZclpxQ2dYN0w1OWJaX05tWHV1UmxycjlLZk5TTEFKbjA3VXAySVA4OXdKdEdJc0VQZEpSTkRrbW04RkpmQXZ0Y25WYjVWWENzZUdab2FfV0l1NEY4aVMxMDYyVmhoc1lfWjhla3RfN1h6ci1rdXJhdGhPME1KZmFBY0dsa3R1Vmp3MUdNZU9LckYwYklZSkI3ZldkaHJwVUFvM3A3VHE0RkwtQUk2anA5aHBKRk45Rk0iLAogICAgICAgICAicHJvdGVjdGVkIjogImV5Sm1iM0p0WVhSTVpXNW5kR2dpT2pFM05Dd2labTl5YldGMFZHRnBiQ0k2SW1aUklpd2lkR2x0WlNJNklqSXdNVGN0TURndE1qQlVNREk2TWpJNk1qbGFJbjAiCiAgICAgIH0KICAgXQp9"}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"key_id":"bOY__C4AqPpQ4II47GWgozELwQRcsGfjXZkjxp3TqEHD","private_key":"OYr0Px6Yc_QrfhLAGfvVwUw1WcsTsC6w7yxZX3osbxUo","authorization":"ewogICAicGF5bG9hZCI6ICJleUpsZUhCcGNtRjBhVzl1SWpvaU1qQXhOeTB4TUMwd01WUXhOem94TkRvME1Wb2lMQ0owYjJ0bGJpSTZJbEZ4TWtzdFVVb3RkM2s0Tm04eUxWTlZXRVpPZURsMlIwUk9Xak13T0V4VldrTkJjelJtVWtGak9HYzlJaXdpYldGNFJXNW5hVzVsY3lJNk1UQXNJbk5qWVc1dWFXNW5SVzVoWW14bFpDSTZkSEoxWlN3aWJHbGpaVzV6WlZSNWNHVWlPaUpQWm1ac2FXNWxJaXdpZEdsbGNpSTZJbEJ5YjJSMVkzUnBiMjRpZlEiLAogICAic2lnbmF0dXJlcyI6IFsKICAgICAgewogICAgICAgICAiaGVhZGVyIjogewogICAgICAgICAgICAiandrIjogewogICAgICAgICAgICAgICAiZSI6ICJBUUFCIiwKICAgICAgICAgICAgICAgImtleUlEIjogIko3TEQ6NjdWUjpMNUhaOlU3QkE6Mk80Rzo0QUwzOk9GMk46SkhHQjpFRlRIOjVDVlE6TUZFTzpBRUlUIiwKICAgICAgICAgICAgICAgImtpZCI6ICJKN0xEOjY3VlI6TDVIWjpVN0JBOjJPNEc6NEFMMzpPRjJOOkpIR0I6RUZUSDo1Q1ZROk1GRU86QUVJVCIsCiAgICAgICAgICAgICAgICJrdHkiOiAiUlNBIiwKICAgICAgICAgICAgICAgIm4iOiAieWRJeS1sVTdvN1BjZVktNC1zLUNRNU9FZ0N5RjhDeEljUUlXdUs4NHBJaVpjaVk2NzMweUNZbndMU0tUbHctVTZVQ19RUmVXUmlvTU5ORTVEczVUWUVYYkdHNm9sbTJxZFdiQndjQ2ctMlVVSF9PY0I5V3VQNmdSUEhwTUZNc3hEeld3dmF5OEpVdUhnWVVMVXBtMUl2LW1xN2xwNW5RX1J4clQwS1pSQVFUWUxFTUVmR3dtM2hNT19nZUxQUy1oZ0tQdElIbGtnNl9XY294VEdvS1A3OWRfd2FIWXhHTmw3V2hTbmVpQlN4YnBiUUFLazIxbGc3OThYYjd2WnlFQVRETXJSUjlNZUU2QWRqNUhKcFkzQ295UkFQQ21hS0dSQ0s0dW9aU29JdTBoRlZsS1VQeWJidzAwMEdPLXdhMktOOFV3Z0lJbTBpNUkxdVc5R2txNHpqQnk1emhncXVVWGJHOWJXUEFPWXJxNVFhODFEeEdjQmxKeUhZQXAtRERQRTlUR2c0elltWGpKbnhacUhFZHVHcWRldlo4WE1JMHVrZmtHSUkxNHdVT2lNSUlJclhsRWNCZl80Nkk4Z1FXRHp4eWNaZV9KR1gtTEF1YXlYcnlyVUZlaFZOVWRaVWw5d1hOYUpCLWthQ3F6NVF3YVI5M3NHdy1RU2Z0RDBOdkxlN0N5T0gtRTZ2ZzZTdF9OZVR2Z3Y4WW5oQ2lYSWxaOEhPZkl3TmU3dEVGX1VjejVPYlB5a20zdHlsck5VanQwVnlBbXR0YWNWSTJpR2loY1VQcm1rNGxWSVo3VkRfTFNXLWk3eW9TdXJ0cHNQWGNlMnBLRElvMzBsSkdoT18zS1VtbDJTVVpDcXpKMXlFbUtweXNINUhEVzljc0lGQ0EzZGVBamZaVXZON1UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgICJhbGciOiAiUlMyNTYiCiAgICAgICAgIH0sCiAgICAgICAgICJzaWduYXR1cmUiOiAicktLcG9XMVhDYVYxSXdnNlR1cVNkazhuUWY2bVZoV05hSnZ0M1FKaVZwYkg3SDdnbmdUcWhmWE9BNXcyT0lkZDdTSXBYTnVhSlZ6X2JEZTJtd0VSVXVoS0ZEM1JPLWdmdWpOc2ZjcExzdVVtSmc0c1gxaHllZEQ1WXRnRHNZYzEzSDNoVUhBMHc4X1RtZWJCaWU4anFUOU1UVl9fOUNyYnpxSUs4Z0U1cVZoZmc5QXZ0WWNSVTVUeE1HUmtmOWhxU2txUjJxeHRwVTFtVUtTMURiQzc3QXZFNFZrNjc2bUR3UHdvTUVtN082Q0QyY0EyaFhsQllnYmx4Y3dFMjM4OVRPWWU0X2xQMGxzZTdSMTJpS2I0QUkwNkR4VUFFNkxwOXFLcFhEYUdLYWJEVVhMMkFIRkdBeG5pS2VqQURqMW5TUUp0dTRydFhDbEFqLXhjRC1rY2wyb1Z5cWNMM2N4VTZGdzg3VHhtdUpNYVRhejhfRW85TUZjSmcxZHhkY2NkVVVxTm5mRHlyX3E0Z01JZ1h1R2REU2RVa3lvLU41eFJVVHhubkR2eW5qTE1jNzYzUnRoY2hvajFqQzBkNmJGUHZfdnFSbTVTZDJobnFCaVRHeG54TGxPUUlhd2pMNElHTEI1bTBocWRMTTNVUUVsd1ZZNGNRNEJvNWZZclpxQ2dYN0w1OWJaX05tWHV1UmxycjlLZk5TTEFKbjA3VXAySVA4OXdKdEdJc0VQZEpSTkRrbW04RkpmQXZ0Y25WYjVWWENzZUdab2FfV0l1NEY4aVMxMDYyVmhoc1lfWjhla3RfN1h6ci1rdXJhdGhPME1KZmFBY0dsa3R1Vmp3MUdNZU9LckYwYklZSkI3ZldkaHJwVUFvM3A3VHE0RkwtQUk2anA5aHBKRk45Rk0iLAogICAgICAgICAicHJvdGVjdGVkIjogImV5Sm1iM0p0WVhSTVpXNW5kR2dpT2pFM05Dd2labTl5YldGMFZHRnBiQ0k2SW1aUklpd2lkR2x0WlNJNklqSXdNVGN0TURndE1qQlVNREk2TWpJNk1qbGFJbjAiCiAgICAgIH0KICAgXQp9"}