From 168aa3e6b1cdc1bfce0b0692d61d4edd4be5cc5e Mon Sep 17 00:00:00 2001
From: kkanova <kkanova@redhat.com>
Date: Tue, 2 Jul 2019 09:11:12 +0200
Subject: [PATCH] Keeping docker layers the same

Signed-off-by: kkanova <kkanova@redhat.com>
---
 dockerfiles/e2e/Dockerfile           | 17 ++++++++++-------
 dockerfiles/e2e/docker-entrypoint.sh |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/dockerfiles/e2e/Dockerfile b/dockerfiles/e2e/Dockerfile
index a6c3202a22..9aa84f4a68 100644
--- a/dockerfiles/e2e/Dockerfile
+++ b/dockerfiles/e2e/Dockerfile
@@ -9,9 +9,9 @@ FROM library/centos:centos7
 ENV LANG=en_US.utf8 \
     DISPLAY=:99 \
     FABRIC8_USER_NAME=fabric8
-
+    
 COPY google-chrome.repo /etc/yum.repos.d/google-chrome.repo
-COPY e2e /root/e2e
+
 RUN yum install --assumeyes epel-release && \
     yum update --assumeyes && \
     yum install --assumeyes google-chrome-stable && \
@@ -30,12 +30,15 @@ RUN yum install --assumeyes epel-release && \
     chrome_version=$(google-chrome --version | grep -oiE "[0-9]*\.[0-9]*\.[0-9]*") && \
     chromedriver_version=$(curl -s -g https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${chrome_version}) && \
     $(curl -sS -g https://chromedriver.storage.googleapis.com/${chromedriver_version}/chromedriver_linux64.zip > chromedriver_linux64.zip) && \
-    unzip chromedriver_linux64.zip && mv chromedriver /usr/bin/chromedriver && chmod +x /usr/bin/chromedriver && rm chromedriver_linux64.zip && \
-    # Download all dependencies for e2e tests
-    cd /root/e2e && \
+    unzip chromedriver_linux64.zip && mv chromedriver /usr/bin/chromedriver && chmod +x /usr/bin/chromedriver && rm chromedriver_linux64.zip
+    
+COPY e2e/package.json e2e/package-lock.json /root/e2e/
+RUN cd /root/e2e && \
     npm --silent i
     
-WORKDIR /root/
+COPY e2e /root/e2e
 COPY docker-entrypoint.sh /root/
 
-ENTRYPOINT ["/root/docker-entrypoint.sh"]
\ No newline at end of file
+WORKDIR /root/
+
+ENTRYPOINT ["/root/docker-entrypoint.sh"]
diff --git a/dockerfiles/e2e/docker-entrypoint.sh b/dockerfiles/e2e/docker-entrypoint.sh
index 1623129c99..1450d0b898 100755
--- a/dockerfiles/e2e/docker-entrypoint.sh
+++ b/dockerfiles/e2e/docker-entrypoint.sh
@@ -22,4 +22,4 @@ else
 	cd e2e
 fi
 
-npm run test
\ No newline at end of file
+npm run test