chromium: refactor into base-chromium, child chromium5 and chromium10…

… images

browsers/base-chromium/Dockerfile

@@ -0,0 +1,22 @@
+FROM netcapsule/base-browser
+
+RUN apt-get update && apt-get install -y libpango1.0-0 libfreetype6 libnss3-1d libnspr4-0d libasound2 libgconf-2-4 libgtk2.0-0 libnss3-tools jwm zip \
+    && rm -rf /var/lib/apt/lists/*
+
+# install old libgcrypt
+RUN echo "deb http://ftp.de.debian.org/debian wheezy main" >> /etc/apt/sources.list \
+    && apt-get update \
+    && apt-get install -y libgcrypt11
+
+USER browser
+
+WORKDIR /home/browser
+
+COPY jwmrc /home/browser/.jwmrc
+
+COPY run.sh /app/run.sh
+
+RUN sudo chmod a+x /app/run.sh
+
+CMD /app/entry_point.sh /app/run.sh
+

browsers/chromium10/Dockerfile

@@ -1,28 +1,12 @@
-FROM netcapsule/base-browser
+FROM netcapsule/base-chromium
 
 # To get a different version, use "Position Lookup" here: [https://omahaproxy.appspot.com] to find the position code for that version string,
 # then look for that postition code here: [https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/].
 # If it exists, use [https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/<POSITION_CODE>/chrome-linux.zip].
 # See also [http://www.chromium.org/getting-involved/download-chromium].
-RUN apt-get update && apt-get install -y libpango1.0-0 libfreetype6 libnss3-1d libnspr4-0d libasound2 libgconf-2-4 libgtk2.0-0 libnss3-tools jwm zip \
-    && rm -rf /var/lib/apt/lists/* \
-    && wget -q https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/72316/chrome-linux.zip \
-    && unzip chrome-linux.zip -d /home/browser
+ENV POSITION_CODE 72316
 
-# install old libgcrypt
-RUN echo "deb http://ftp.de.debian.org/debian wheezy main" >> /etc/apt/sources.list \
-    && apt-get update \
-    && apt-get install -y libgcrypt11
+RUN wget -q https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/${POSITION_CODE}/chrome-linux.zip;\
+    unzip chrome-linux.zip -d /home/browser
 
-USER browser
-
-COPY jwmrc /home/browser/.jwmrc
-
-COPY run.sh /app/run.sh
-
-RUN sudo chmod a+x /app/run.sh
-
-WORKDIR /home/browser
-
-CMD /app/entry_point.sh /app/run.sh
 

browsers/chromium5/Dockerfile

@@ -1,28 +1,12 @@
-FROM netcapsule/base-browser
+FROM netcapsule/base-chromium
 
 # To get a different version, use "Position Lookup" here: [https://omahaproxy.appspot.com] to find the position code for that version string,
 # then look for that postition code here: [https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/].
 # If it exists, use [https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/<POSITION_CODE>/chrome-linux.zip].
 # See also [http://www.chromium.org/getting-involved/download-chromium].
-RUN apt-get update && apt-get install -y libpango1.0-0 libfreetype6 libnss3-1d libnspr4-0d libasound2 libgconf-2-4 libgtk2.0-0 libnss3-tools jwm zip \
-    && rm -rf /var/lib/apt/lists/* \
-    && wget -q https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/44202/chrome-linux.zip \
-    && unzip chrome-linux.zip -d /home/browser
+ENV POSITION_CODE 44202
 
-# install old libgcrypt
-RUN echo "deb http://ftp.de.debian.org/debian wheezy main" >> /etc/apt/sources.list \
-    && apt-get update \
-    && apt-get install -y libgcrypt11
+RUN wget -q https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/${POSITION_CODE}/chrome-linux.zip;\
+    unzip chrome-linux.zip -d /home/browser
 
-USER browser
-
-COPY jwmrc /home/browser/.jwmrc
-
-COPY run.sh /app/run.sh
-
-RUN sudo chmod a+x /app/run.sh
-
-WORKDIR /home/browser
-
-CMD /app/entry_point.sh /app/run.sh