Browse Source

Base32/base64 images.

Herbert Vojčík 6 years ago
parent
commit
3a999514a5
4 changed files with 40 additions and 30 deletions
  1. 4 18
      61_32/Dockerfile
  2. 4 12
      61_64/Dockerfile
  3. 19 0
      base_32/Dockerfile
  4. 13 0
      base_64/Dockerfile

+ 4 - 18
61_32/Dockerfile

@@ -1,20 +1,4 @@
-FROM ubuntu:16.04
-
-RUN dpkg --add-architecture i386
-RUN apt-get update -q
-RUN apt-get -qy --no-install-recommends install \
-        libx11-6:i386 \
-        libgl1-mesa-glx:i386 \
-        libfontconfig1:i386 \
-        libssl1.0.0:i386 \
-        libfreetype6:i386 \
-        libcurl3:i386 \
-        libsqlite3-0:i386 \
-        curl \
-        unzip
-
-RUN apt-get clean
-RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+FROM herbysk/pharo:base_32
 
 RUN mkdir -p /opt/pharo &&\
         cd /opt/pharo &&\
@@ -23,4 +7,6 @@ RUN mkdir -p /opt/pharo &&\
             `/sbin/ldconfig -p | grep -v x86-64 | sed -e 's|[^/]*||' | grep sqlite3` \
             `find . -type f -name SqueakSSL.so -print0 | xargs -0 dirname`/sqlite3.so
 
-RUN echo "Pharo 32bit installed"
+RUN cd /usr/local/bin && ln -s /opt/pharo/pharo && ln -s /opt/pharo/pharo-ui
+
+RUN pharo /opt/pharo/Pharo.image eval  "'Pharo {1}bit installed\' format: {32}"

+ 4 - 12
61_64/Dockerfile

@@ -1,14 +1,4 @@
-FROM ubuntu:16.04
-
-RUN apt-get update -q
-RUN apt-get -qy --no-install-recommends install \
-        libfreetype6 \
-        libcurl3 \
-        curl \
-        unzip
-
-RUN apt-get clean
-RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+FROM herbysk/pharo:base_64
 
 RUN mkdir -p /opt/pharo &&\
         cd /opt/pharo &&\
@@ -17,4 +7,6 @@ RUN mkdir -p /opt/pharo &&\
             `/sbin/ldconfig -p | sed -e 's|[^/]*||' | grep sqlite3` \
             `find . -type f -name SqueakSSL.so -print0 | xargs -0 dirname`/sqlite3.so
 
-RUN echo "Pharo 64bit installed"
+RUN cd /usr/local/bin && ln -s /opt/pharo/pharo && ln -s /opt/pharo/pharo-ui
+
+RUN pharo /opt/pharo/Pharo.image eval  "'Pharo {1}bit installed\' format: {64}"

+ 19 - 0
base_32/Dockerfile

@@ -0,0 +1,19 @@
+FROM ubuntu:16.04
+
+RUN dpkg --add-architecture i386
+RUN apt-get update -q
+RUN apt-get -qy --no-install-recommends install \
+        libx11-6:i386 \
+        libgl1-mesa-glx:i386 \
+        libfontconfig1:i386 \
+        libssl1.0.0:i386 \
+        libfreetype6:i386 \
+        libcurl3:i386 \
+        libsqlite3-0:i386 \
+        curl \
+        unzip
+
+RUN apt-get clean
+RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN echo "Pharo 32bit prerequisities installed."

+ 13 - 0
base_64/Dockerfile

@@ -0,0 +1,13 @@
+FROM ubuntu:16.04
+
+RUN apt-get update -q
+RUN apt-get -qy --no-install-recommends install \
+        libfreetype6 \
+        libcurl3 \
+        curl \
+        unzip
+
+RUN apt-get clean
+RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN echo  "Pharo 64bit prerequisities installed."