diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-05-08 11:24:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-08 11:24:53 -0400 |
| commit | 970e772a981e8ada2abe56e2375e1eb81d53cb8a (patch) | |
| tree | 974983e745f3cebb9542e0330f49a949b00a5985 | |
| parent | b3f9e9ff4b8a7c69ec588ac9c5d0e9a8aa852f0a (diff) | |
| parent | fbadeb45ce30d1726cc8881c7bd0264416819265 (diff) | |
| download | openshift-970e772a981e8ada2abe56e2375e1eb81d53cb8a.tar.gz openshift-970e772a981e8ada2abe56e2375e1eb81d53cb8a.tar.bz2 openshift-970e772a981e8ada2abe56e2375e1eb81d53cb8a.tar.xz openshift-970e772a981e8ada2abe56e2375e1eb81d53cb8a.zip | |
Merge pull request #4114 from jupierce/move_images
Moving Dockerfile content to images dir
| -rw-r--r-- | images/installer/Dockerfile (renamed from Dockerfile) | 0 | ||||
| -rw-r--r-- | images/installer/Dockerfile.rhel7 (renamed from Dockerfile.rhel7) | 0 | ||||
| -rw-r--r-- | images/installer/system-container/README.md (renamed from system-container/README.md) | 0 | ||||
| -rw-r--r-- | images/installer/system-container/root/exports/config.json.template (renamed from system-container/root/exports/config.json.template) | 0 | ||||
| -rw-r--r-- | images/installer/system-container/root/exports/manifest.json (renamed from system-container/root/exports/manifest.json) | 0 | ||||
| -rw-r--r-- | images/installer/system-container/root/exports/service.template (renamed from system-container/root/exports/service.template) | 0 | ||||
| -rw-r--r-- | images/installer/system-container/root/exports/tmpfiles.template (renamed from system-container/root/exports/tmpfiles.template) | 0 | ||||
| -rwxr-xr-x | images/installer/system-container/root/usr/local/bin/run-system-container.sh (renamed from system-container/root/usr/local/bin/run-system-container.sh) | 0 |
8 files changed, 0 insertions, 0 deletions
diff --git a/Dockerfile b/images/installer/Dockerfile index 1df887f32..1df887f32 100644 --- a/Dockerfile +++ b/images/installer/Dockerfile diff --git a/Dockerfile.rhel7 b/images/installer/Dockerfile.rhel7 index 00841e660..00841e660 100644 --- a/Dockerfile.rhel7 +++ b/images/installer/Dockerfile.rhel7 diff --git a/system-container/README.md b/images/installer/system-container/README.md index dc95307e5..dc95307e5 100644 --- a/system-container/README.md +++ b/images/installer/system-container/README.md diff --git a/system-container/root/exports/config.json.template b/images/installer/system-container/root/exports/config.json.template index 383e3696e..383e3696e 100644 --- a/system-container/root/exports/config.json.template +++ b/images/installer/system-container/root/exports/config.json.template diff --git a/system-container/root/exports/manifest.json b/images/installer/system-container/root/exports/manifest.json index 1db845965..1db845965 100644 --- a/system-container/root/exports/manifest.json +++ b/images/installer/system-container/root/exports/manifest.json diff --git a/system-container/root/exports/service.template b/images/installer/system-container/root/exports/service.template index bf5316af6..bf5316af6 100644 --- a/system-container/root/exports/service.template +++ b/images/installer/system-container/root/exports/service.template diff --git a/system-container/root/exports/tmpfiles.template b/images/installer/system-container/root/exports/tmpfiles.template index b1f6caf47..b1f6caf47 100644 --- a/system-container/root/exports/tmpfiles.template +++ b/images/installer/system-container/root/exports/tmpfiles.template diff --git a/system-container/root/usr/local/bin/run-system-container.sh b/images/installer/system-container/root/usr/local/bin/run-system-container.sh index 9ce7c7328..9ce7c7328 100755 --- a/system-container/root/usr/local/bin/run-system-container.sh +++ b/images/installer/system-container/root/usr/local/bin/run-system-container.sh |