Make sure Sarge builds are i386

r-hub · Aug 12, 2023 · 046fe03 · 046fe03
1 parent 3c55632
commit 046fe03
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/containers/Dockerfile-sarge b/containers/Dockerfile-sarge
@@ -10,7 +10,7 @@ RUN echo 'deb http://ppa.r-pkg.org/evercran sarge main' \
     >> /etc/apt/sources.list
 
 RUN apt-get update && \
-    apt-get install -y r-${R_VERSION} && \
+    apt-get install -y linux32 r-${R_VERSION} && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
     mkdir -p /var/lib/apt/lists/partial
@@ -27,4 +27,5 @@ RUN (echo 'library()' | /opt/R/${R_VERSION}/bin/R --vanilla | cat) || \
 
 WORKDIR /root
 
+ENTRYPOINT [ "linux32" ]
 CMD [ "R" ]
diff --git a/r-builds/Dockerfile-sarge b/r-builds/Dockerfile-sarge
@@ -1,3 +1,4 @@
+# -*- Dockerfile -*-
 
 FROM debian/eol:sarge
 
@@ -7,9 +8,13 @@ ENV PAGER=less
 ENV LESS=-r
 
 ARG R_VERSION=0.49
-ARG IN_PLACE=no
+
+RUN apt-get update && apt-get install -y linux32
+
+ENTRYPOINT [ "linux32" ]
+CMD [ "bash" ]
 
 COPY build.sh .
 COPY patch patch
 
-RUN ./build.sh
+RUN linux32 ./build.sh