From 23e07b78f5b3e041fb72baa41beb622d07d4f497 Mon Sep 17 00:00:00 2001 From: Mike Shriver Date: Mon, 17 Jun 2019 10:11:44 -0400 Subject: [PATCH] Move dev dockerfiles into dockerfiles dir --- Dockerfile => dockerfiles/cfme_tests_dev/Dockerfile | 8 ++++---- .../cfme_tests_dev/docker-assets}/entrypoint | 0 .../cfme_tests_dev/docker-assets}/google-chrome.repo | 0 .../cfme_tests_dev/docker-assets}/xstartup | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename Dockerfile => dockerfiles/cfme_tests_dev/Dockerfile (93%) rename {docker-assets => dockerfiles/cfme_tests_dev/docker-assets}/entrypoint (100%) rename {docker-assets => dockerfiles/cfme_tests_dev/docker-assets}/google-chrome.repo (100%) rename {docker-assets => dockerfiles/cfme_tests_dev/docker-assets}/xstartup (100%) diff --git a/Dockerfile b/dockerfiles/cfme_tests_dev/Dockerfile similarity index 93% rename from Dockerfile rename to dockerfiles/cfme_tests_dev/Dockerfile index bbc7c85566..18a53d7b71 100644 --- a/Dockerfile +++ b/dockerfiles/cfme_tests_dev/Dockerfile @@ -2,7 +2,7 @@ FROM registry.fedoraproject.org/fedora:26 RUN echo "tsflags=nodocs" >> /etc/yum.conf -COPY docker-assets/google-chrome.repo /etc/yum.repos.d/ +COPY ../docker-assets/google-chrome.repo /etc/yum.repos.d/ RUN dnf install -y http://linuxdownload.adobe.com/linux/x86_64/adobe-release-x86_64-1.0-1.noarch.rpm && \ rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-adobe-linux && \ @@ -84,7 +84,7 @@ RUN virtualenv /cfme_venv RUN echo "source /cfme_venv/bin/activate" >> /root/.bashrc # Preinstall any python dependencies to keep it in an early layer -COPY requirements/frozen.py2.txt frozen.py2.txt +COPY ../requirements/frozen.py2.txt frozen.py2.txt RUN /cfme_venv/bin/pip install --no-cache-dir -U pip wheel setuptools_scm docutils && \ /cfme_venv/bin/pip install --no-cache-dir -r frozen.py2.txt --no-binary pycurl && \ rm -rf ~/.cache/pip && \ @@ -94,7 +94,7 @@ RUN /cfme_venv/bin/pip install --no-cache-dir -U pip wheel setuptools_scm docuti VOLUME /projects/cfme_env/cfme_vol WORKDIR /projects/cfme_env/cfme_vol -COPY docker-assets/xstartup /xstartup -COPY docker-assets/entrypoint /entrypoint +COPY ../docker-assets/xstartup /xstartup +COPY ../docker-assets/entrypoint /entrypoint ENTRYPOINT ["/entrypoint"] diff --git a/docker-assets/entrypoint b/dockerfiles/cfme_tests_dev/docker-assets/entrypoint similarity index 100% rename from docker-assets/entrypoint rename to dockerfiles/cfme_tests_dev/docker-assets/entrypoint diff --git a/docker-assets/google-chrome.repo b/dockerfiles/cfme_tests_dev/docker-assets/google-chrome.repo similarity index 100% rename from docker-assets/google-chrome.repo rename to dockerfiles/cfme_tests_dev/docker-assets/google-chrome.repo diff --git a/docker-assets/xstartup b/dockerfiles/cfme_tests_dev/docker-assets/xstartup similarity index 100% rename from docker-assets/xstartup rename to dockerfiles/cfme_tests_dev/docker-assets/xstartup