From effcb6bdb370b72598c72b6ab56132869ed0a7b1 Mon Sep 17 00:00:00 2001 From: Mate Farkas <mate.farkas@sch.hu> Date: Thu, 3 Aug 2017 18:55:14 +0100 Subject: [PATCH] Images have been moved around. --- docker/amazonlinux/{ => base}/Dockerfile | 0 docker/amazonlinux/{ => base}/Makefile | 0 docker/amazonlinux/{ => base}/README.md | 0 docker/amazonlinux/{ => base}/etc/environment | 0 docker/amazonlinux/{ => base}/etc/mini-init/99-ssh | 0 docker/amazonlinux/{ => base}/etc/sudoers.d/vagrant | 0 docker/amazonlinux/{ => base}/home/vagrant/.ssh/authorized_keys | 0 docker/amazonlinux/{ => base}/sbin/mini-init | 0 docker/xenial/{ => base}/Dockerfile | 0 docker/xenial/{ => base}/Makefile | 0 docker/xenial/{ => base}/README.md | 0 docker/xenial/{ => base}/etc/environment | 0 docker/xenial/{ => base}/etc/mini-init/99-ssh | 0 docker/xenial/{ => base}/etc/sudoers.d/vagrant | 0 docker/xenial/{ => base}/home/vagrant/.ssh/authorized_keys | 0 docker/xenial/{ => base}/sbin/mini-init | 0 docker/{ => xenial}/cloud-init/Dockerfile | 0 docker/{ => xenial}/cloud-init/Makefile | 0 docker/{ => xenial}/cloud-init/README.md | 0 docker/{ => xenial}/cloud-init/etc/mini-init/cloud-init | 0 .../{ => xenial}/cloud-init/var/lib/cloud/seed/nocloud/meta-data | 0 .../{ => xenial}/cloud-init/var/lib/cloud/seed/nocloud/user-data | 0 docker/{ => xenial}/puppet5/Dockerfile | 0 docker/{ => xenial}/puppet5/Makefile | 0 docker/{ => xenial}/puppet5/README.md | 0 docker/{ => xenial}/puppet5/etc/puppetlabs/r10k/r10k.yaml | 0 docker/{ => xenial}/puppet5/home/vagrant/.gitconfig | 0 docker/{ => xenial}/repo/Dockerfile | 0 docker/{ => xenial}/repo/Makefile | 0 docker/{ => xenial}/repo/README.md | 0 docker/{ => xenial}/repo/etc/mini-init/10-nginx | 0 docker/{ => xenial}/repo/etc/nginx/sites-available/repo | 0 docker/{ => xenial}/repo/usr/local/bin/update-apt-repository | 0 33 files changed, 0 insertions(+), 0 deletions(-) rename docker/amazonlinux/{ => base}/Dockerfile (100%) rename docker/amazonlinux/{ => base}/Makefile (100%) rename docker/amazonlinux/{ => base}/README.md (100%) rename docker/amazonlinux/{ => base}/etc/environment (100%) rename docker/amazonlinux/{ => base}/etc/mini-init/99-ssh (100%) rename docker/amazonlinux/{ => base}/etc/sudoers.d/vagrant (100%) rename docker/amazonlinux/{ => base}/home/vagrant/.ssh/authorized_keys (100%) rename docker/amazonlinux/{ => base}/sbin/mini-init (100%) rename docker/xenial/{ => base}/Dockerfile (100%) rename docker/xenial/{ => base}/Makefile (100%) rename docker/xenial/{ => base}/README.md (100%) rename docker/xenial/{ => base}/etc/environment (100%) rename docker/xenial/{ => base}/etc/mini-init/99-ssh (100%) rename docker/xenial/{ => base}/etc/sudoers.d/vagrant (100%) rename docker/xenial/{ => base}/home/vagrant/.ssh/authorized_keys (100%) rename docker/xenial/{ => base}/sbin/mini-init (100%) rename docker/{ => xenial}/cloud-init/Dockerfile (100%) rename docker/{ => xenial}/cloud-init/Makefile (100%) rename docker/{ => xenial}/cloud-init/README.md (100%) rename docker/{ => xenial}/cloud-init/etc/mini-init/cloud-init (100%) rename docker/{ => xenial}/cloud-init/var/lib/cloud/seed/nocloud/meta-data (100%) rename docker/{ => xenial}/cloud-init/var/lib/cloud/seed/nocloud/user-data (100%) rename docker/{ => xenial}/puppet5/Dockerfile (100%) rename docker/{ => xenial}/puppet5/Makefile (100%) rename docker/{ => xenial}/puppet5/README.md (100%) rename docker/{ => xenial}/puppet5/etc/puppetlabs/r10k/r10k.yaml (100%) rename docker/{ => xenial}/puppet5/home/vagrant/.gitconfig (100%) rename docker/{ => xenial}/repo/Dockerfile (100%) rename docker/{ => xenial}/repo/Makefile (100%) rename docker/{ => xenial}/repo/README.md (100%) rename docker/{ => xenial}/repo/etc/mini-init/10-nginx (100%) rename docker/{ => xenial}/repo/etc/nginx/sites-available/repo (100%) rename docker/{ => xenial}/repo/usr/local/bin/update-apt-repository (100%) diff --git a/docker/amazonlinux/Dockerfile b/docker/amazonlinux/base/Dockerfile similarity index 100% rename from docker/amazonlinux/Dockerfile rename to docker/amazonlinux/base/Dockerfile diff --git a/docker/amazonlinux/Makefile b/docker/amazonlinux/base/Makefile similarity index 100% rename from docker/amazonlinux/Makefile rename to docker/amazonlinux/base/Makefile diff --git a/docker/amazonlinux/README.md b/docker/amazonlinux/base/README.md similarity index 100% rename from docker/amazonlinux/README.md rename to docker/amazonlinux/base/README.md diff --git a/docker/amazonlinux/etc/environment b/docker/amazonlinux/base/etc/environment similarity index 100% rename from docker/amazonlinux/etc/environment rename to docker/amazonlinux/base/etc/environment diff --git a/docker/amazonlinux/etc/mini-init/99-ssh b/docker/amazonlinux/base/etc/mini-init/99-ssh similarity index 100% rename from docker/amazonlinux/etc/mini-init/99-ssh rename to docker/amazonlinux/base/etc/mini-init/99-ssh diff --git a/docker/amazonlinux/etc/sudoers.d/vagrant b/docker/amazonlinux/base/etc/sudoers.d/vagrant similarity index 100% rename from docker/amazonlinux/etc/sudoers.d/vagrant rename to docker/amazonlinux/base/etc/sudoers.d/vagrant diff --git a/docker/amazonlinux/home/vagrant/.ssh/authorized_keys b/docker/amazonlinux/base/home/vagrant/.ssh/authorized_keys similarity index 100% rename from docker/amazonlinux/home/vagrant/.ssh/authorized_keys rename to docker/amazonlinux/base/home/vagrant/.ssh/authorized_keys diff --git a/docker/amazonlinux/sbin/mini-init b/docker/amazonlinux/base/sbin/mini-init similarity index 100% rename from docker/amazonlinux/sbin/mini-init rename to docker/amazonlinux/base/sbin/mini-init diff --git a/docker/xenial/Dockerfile b/docker/xenial/base/Dockerfile similarity index 100% rename from docker/xenial/Dockerfile rename to docker/xenial/base/Dockerfile diff --git a/docker/xenial/Makefile b/docker/xenial/base/Makefile similarity index 100% rename from docker/xenial/Makefile rename to docker/xenial/base/Makefile diff --git a/docker/xenial/README.md b/docker/xenial/base/README.md similarity index 100% rename from docker/xenial/README.md rename to docker/xenial/base/README.md diff --git a/docker/xenial/etc/environment b/docker/xenial/base/etc/environment similarity index 100% rename from docker/xenial/etc/environment rename to docker/xenial/base/etc/environment diff --git a/docker/xenial/etc/mini-init/99-ssh b/docker/xenial/base/etc/mini-init/99-ssh similarity index 100% rename from docker/xenial/etc/mini-init/99-ssh rename to docker/xenial/base/etc/mini-init/99-ssh diff --git a/docker/xenial/etc/sudoers.d/vagrant b/docker/xenial/base/etc/sudoers.d/vagrant similarity index 100% rename from docker/xenial/etc/sudoers.d/vagrant rename to docker/xenial/base/etc/sudoers.d/vagrant diff --git a/docker/xenial/home/vagrant/.ssh/authorized_keys b/docker/xenial/base/home/vagrant/.ssh/authorized_keys similarity index 100% rename from docker/xenial/home/vagrant/.ssh/authorized_keys rename to docker/xenial/base/home/vagrant/.ssh/authorized_keys diff --git a/docker/xenial/sbin/mini-init b/docker/xenial/base/sbin/mini-init similarity index 100% rename from docker/xenial/sbin/mini-init rename to docker/xenial/base/sbin/mini-init diff --git a/docker/cloud-init/Dockerfile b/docker/xenial/cloud-init/Dockerfile similarity index 100% rename from docker/cloud-init/Dockerfile rename to docker/xenial/cloud-init/Dockerfile diff --git a/docker/cloud-init/Makefile b/docker/xenial/cloud-init/Makefile similarity index 100% rename from docker/cloud-init/Makefile rename to docker/xenial/cloud-init/Makefile diff --git a/docker/cloud-init/README.md b/docker/xenial/cloud-init/README.md similarity index 100% rename from docker/cloud-init/README.md rename to docker/xenial/cloud-init/README.md diff --git a/docker/cloud-init/etc/mini-init/cloud-init b/docker/xenial/cloud-init/etc/mini-init/cloud-init similarity index 100% rename from docker/cloud-init/etc/mini-init/cloud-init rename to docker/xenial/cloud-init/etc/mini-init/cloud-init diff --git a/docker/cloud-init/var/lib/cloud/seed/nocloud/meta-data b/docker/xenial/cloud-init/var/lib/cloud/seed/nocloud/meta-data similarity index 100% rename from docker/cloud-init/var/lib/cloud/seed/nocloud/meta-data rename to docker/xenial/cloud-init/var/lib/cloud/seed/nocloud/meta-data diff --git a/docker/cloud-init/var/lib/cloud/seed/nocloud/user-data b/docker/xenial/cloud-init/var/lib/cloud/seed/nocloud/user-data similarity index 100% rename from docker/cloud-init/var/lib/cloud/seed/nocloud/user-data rename to docker/xenial/cloud-init/var/lib/cloud/seed/nocloud/user-data diff --git a/docker/puppet5/Dockerfile b/docker/xenial/puppet5/Dockerfile similarity index 100% rename from docker/puppet5/Dockerfile rename to docker/xenial/puppet5/Dockerfile diff --git a/docker/puppet5/Makefile b/docker/xenial/puppet5/Makefile similarity index 100% rename from docker/puppet5/Makefile rename to docker/xenial/puppet5/Makefile diff --git a/docker/puppet5/README.md b/docker/xenial/puppet5/README.md similarity index 100% rename from docker/puppet5/README.md rename to docker/xenial/puppet5/README.md diff --git a/docker/puppet5/etc/puppetlabs/r10k/r10k.yaml b/docker/xenial/puppet5/etc/puppetlabs/r10k/r10k.yaml similarity index 100% rename from docker/puppet5/etc/puppetlabs/r10k/r10k.yaml rename to docker/xenial/puppet5/etc/puppetlabs/r10k/r10k.yaml diff --git a/docker/puppet5/home/vagrant/.gitconfig b/docker/xenial/puppet5/home/vagrant/.gitconfig similarity index 100% rename from docker/puppet5/home/vagrant/.gitconfig rename to docker/xenial/puppet5/home/vagrant/.gitconfig diff --git a/docker/repo/Dockerfile b/docker/xenial/repo/Dockerfile similarity index 100% rename from docker/repo/Dockerfile rename to docker/xenial/repo/Dockerfile diff --git a/docker/repo/Makefile b/docker/xenial/repo/Makefile similarity index 100% rename from docker/repo/Makefile rename to docker/xenial/repo/Makefile diff --git a/docker/repo/README.md b/docker/xenial/repo/README.md similarity index 100% rename from docker/repo/README.md rename to docker/xenial/repo/README.md diff --git a/docker/repo/etc/mini-init/10-nginx b/docker/xenial/repo/etc/mini-init/10-nginx similarity index 100% rename from docker/repo/etc/mini-init/10-nginx rename to docker/xenial/repo/etc/mini-init/10-nginx diff --git a/docker/repo/etc/nginx/sites-available/repo b/docker/xenial/repo/etc/nginx/sites-available/repo similarity index 100% rename from docker/repo/etc/nginx/sites-available/repo rename to docker/xenial/repo/etc/nginx/sites-available/repo diff --git a/docker/repo/usr/local/bin/update-apt-repository b/docker/xenial/repo/usr/local/bin/update-apt-repository similarity index 100% rename from docker/repo/usr/local/bin/update-apt-repository rename to docker/xenial/repo/usr/local/bin/update-apt-repository -- GitLab