Fix added 200mb due to chown / chmod docker layers

Author: elgalu

CHANGELOG.md

@@ -7,6 +7,29 @@ Note image ids also change after scm-source.json has being updated which trigger
 ###### To get container versions
     docker exec grid versions
 
+## TBD_DOCKER_TAG
+ + **Changes:** https://github.com/elgalu/docker-selenium/compare/3.5.3-p10...3.5.3-p11 (TBD_DATE)
+    + Fix added 200mb due to chown / chmod docker layers
+ + **Image tag details:**
+    + Selenium version: TBD_SELENIUM_3_VERSION (TBD_SELENIUM_3_REVISION)
+    + Chrome stable:  TBD_CHROME_STABLE
+    + Firefox stable: TBD_FIREFOX_FOR_SEL3
+    + Geckodriver: TBD_GECKO_DRIVER
+    + Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
+    + Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
+    + Timezone: TBD_TIME_ZONE
+    + FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
+    + Python: TBD_PYTHON_VERSION
+    + Tested on kernel dev host: 4.4.0-96-generic x86_64
+    + Tested on kernel CI  host: TBD_HOST_UNAME
+    + Built at dev host with: Docker version 17.07.0-ce, build 8784753
+    + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+    + Built at dev host with: Docker Compose version 1.16.1, build 6d1ac21
+    + Built at CI  host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
+    + Image size: TBD_IMAGE_SIZE
+    + Digest: TBD_DIGEST
+    + Image ID: TBD_IMAGE_ID
+
 ## 3.5.3-p10
  + **Changes:** https://github.com/elgalu/docker-selenium/compare/3.5.3-p9...3.5.3-p10 (2017-09-29)
     + Upgrade Firefox major from 55.0.3 to 56 @diemol

CONTRIBUTING.md

@@ -11,7 +11,7 @@ For pull requests or local commits:
 
 For repository owners only:
 
-    git commit -m "Tests: ROLLBACK: Upgrade python bindings from 3.5.0 to selenium==3.6.0"
+    git commit -m "Fix added 200mb due to chown / chmod docker layers"
     git tag -d latest; git tag -d `cat VERSION`; git push origin :`cat VERSION`; git tag `cat VERSION` && git push --force origin tmp-`cat VERSION` && git push --tags
 
 -- Wait for Travis to pass OK

Dockerfile

@@ -550,6 +550,11 @@ USER seluser
 # Regarding the pip packages, see released versions at:
 #  https://github.com/mozilla/mozdownload/releases
 
+#=============================
+# sudo by default from now on
+#=============================
+USER root
+
 ENV FF_LANG="en-US" \
     FF_BASE_URL="https://archive.mozilla.org/pub" \
     FF_PLATFORM="linux-x86_64" \
@@ -560,20 +565,17 @@ ENV FF_LANG="en-US" \
 ENV FF_VER="56.0"
 ENV FF_COMP="firefox-${FF_VER}.tar.bz2"
 ENV FF_URL="${FF_BASE_URL}/${FF_INNER_PATH}/${FF_VER}/${FF_PLATFORM}/${FF_LANG}/${FF_COMP}"
-RUN  wget -nv "${FF_URL}" -O "firefox.tar.bz2" \
+RUN cd /opt \
+  && wget -nv "${FF_URL}" -O "firefox.tar.bz2" \
   && bzip2 -d "firefox.tar.bz2" \
   && tar xf "firefox.tar" \
   && rm "firefox.tar" \
-  && mv firefox firefox-for-sel-3 \
-  && sudo ln -fs /home/seluser/firefox-for-sel-3/firefox /usr/bin/firefox
+  && ln -fs /opt/firefox/firefox /usr/bin/firefox \
+  && chown -R seluser:seluser /opt/firefox \
+  && chmod -R 777 /opt/firefox
 
 LABEL selenium_firefox_version "56.0"
 
-#=============================
-# sudo by default from now on
-#=============================
-USER root
-
 #============
 # GeckoDriver
 #============
@@ -624,7 +626,8 @@ COPY lib/* /usr/lib/
 # Use a custom wallpaper for Fluxbox
 COPY images/wallpaper-dosel.png /usr/share/images/fluxbox/ubuntu-light.png
 COPY images/wallpaper-zalenium.png /usr/share/images/fluxbox/
-RUN chown -R seluser:seluser /usr/share/images/fluxbox/
+RUN chown -R seluser:seluser /usr/share/images/fluxbox/ \
+ && chmod -R 777 /usr/share/images/fluxbox
 
 #===================================================
 # Run the following commands as non-privileged user
@@ -960,6 +963,15 @@ COPY images ./images
 COPY LICENSE.md /home/seluser/
 COPY Analytics.md /home/seluser/
 
+# Include current version
+COPY VERSION /home/seluser/
+
+# Moved from entry.sh
+ENV SUPERVISOR_PIDFILE="${RUN_DIR}/supervisord.pid" \
+    DOCKER_SELENIUM_STATUS="${LOGS_DIR}/docker-selenium-status.log" \
+    VNC_TRYOUT_ERR_LOG="${LOGS_DIR}/vnc-tryouts-stderr" \
+    VNC_TRYOUT_OUT_LOG="${LOGS_DIR}/vnc-tryouts-stdout"
+
 #===================================
 # Fix dirs (again) and final chores
 #===================================
@@ -977,22 +989,9 @@ RUN mkdir -p /home/seluser/.vnc \
   && sudo mkdir -p ${LOGS_DIR} \
   && sudo mkdir -p ${RUN_DIR} \
   && sudo mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \
+  && sudo fixperms.sh \
   && echo ""
 
-# Moved from entry.sh
-ENV SUPERVISOR_PIDFILE="${RUN_DIR}/supervisord.pid" \
-    DOCKER_SELENIUM_STATUS="${LOGS_DIR}/docker-selenium-status.log" \
-    VNC_TRYOUT_ERR_LOG="${LOGS_DIR}/vnc-tryouts-stderr" \
-    VNC_TRYOUT_OUT_LOG="${LOGS_DIR}/vnc-tryouts-stdout"
-
-# Include current version
-COPY VERSION /home/seluser/
-
-######################################################################
-# Relaxing permissions for OpenShift and other non-sudo environments #
-######################################################################
-RUN sudo fixperms.sh
-
 #=====================================================
 # Meta JSON file to hold commit info of current build
 #=====================================================

VERSION

@@ -1 +1 @@
-3.5.3-p10
+3.5.3-p11

bin/entry.sh

@@ -111,7 +111,7 @@ fi
 # Fix/extend ENV vars
 #---------------------
 export SELENIUM_JAR_PATH="/home/seluser/selenium-server-standalone-3.jar"
-export FIREFOX_DEST_BIN="/home/seluser/firefox-for-sel-3/firefox"
+export FIREFOX_DEST_BIN="/usr/bin/firefox"
 export DOSEL_VERSION=$(cat VERSION)
 export FIREFOX_VERSION=$(firefox_version)
 # CHROME_FLAVOR would allow to have separate installations for stable, beta, unstable

bin/fixperms.sh

@@ -3,9 +3,13 @@
 # set +e: don't exit if a command exits with a non-zero status
 set +e
 
+######################################################################
+# Relaxing permissions for OpenShift and other non-sudo environments #
+######################################################################
+
 # List of directories in which we need to fix perms:
-DIR_LIST="/usr/share/images/fluxbox /var/lib/dbus /tmp /var/run /run /var/log /etc/supervisor"
-DIR_LIST="${DIR_LIST} /videos /test /home/seluser"
+DIR_LIST="/var/lib/dbus /tmp /var/run /run /var/log/cont /etc/supervisor"
+DIR_LIST="${DIR_LIST} /videos ${VIDEOS_DIR} /test /home/seluser"
 
 # Relaxing permissions for OpenShift and other non-sudo environments
 chmod 777 /etc/passwd