fixing cppzmq tarball again

WIPACrepo · Aug 28, 2023 · 57d2896 · 57d2896
1 parent d1a5692
commit 57d2896
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 18 deletions.
diff --git a/icecube_ml/Dockerfile_ubuntu_20.04_cuda11.6 b/icecube_ml/Dockerfile_ubuntu_20.04_cuda11.6
@@ -41,8 +41,9 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
 
 RUN pip3 install 'setuptools>=59.5' sphinx breathe meson
 
-RUN curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master -o master.tar.gz && \
-    mkdir cppzmq-master && tar -zxf master.tar.gz -C cppzmq-master && cd cppzmq-master && \
+RUN mkdir cppzmq-master && \
+    curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master | tar xz -C cppzmq-master/ --strip=1 && \
+    cd cppzmq-master && \
     cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local . && make install
 
 # install photospline

diff --git a/icecube_ml/Dockerfile_ubuntu_22.04_cuda11.8 b/icecube_ml/Dockerfile_ubuntu_22.04_cuda11.8
@@ -42,8 +42,9 @@ RUN curl -L https://github.com/zeromq/zmqpp/archive/refs/tags/4.2.0.tar.gz | tar
 
 RUN pip3 install 'setuptools>=59.5' sphinx breathe meson
 
-RUN curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master -o master.tar.gz && \
-    mkdir cppzmq-master && tar -zxf master.tar.gz -C cppzmq-master && cd cppzmq-master && \
+RUN mkdir cppzmq-master && \
+    curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master | tar xz -C cppzmq-master/ --strip=1 && \
+    cd cppzmq-master && \
     cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local . && make install
 
 # install photospline

diff --git a/icetray_base/Dockerfile_base-devel-20.04 b/icetray_base/Dockerfile_base-devel-20.04
@@ -33,8 +33,9 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
 
 RUN pip3 install 'setuptools>=59.5' sphinx breathe 'meson>=1.2.0'
 
-RUN curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master -o master.tar.gz && \
-    mkdir cppzmq-master && tar -zxf master.tar.gz -C cppzmq-master && cd cppzmq-master && \
+RUN mkdir cppzmq-master && \
+    curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master | tar xz -C cppzmq-master/ --strip=1 && \
+    cd cppzmq-master && \
     cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local . && make install
 
 # install photospline

diff --git a/icetray_base/Dockerfile_base-devel-22.04 b/icetray_base/Dockerfile_base-devel-22.04
@@ -42,8 +42,9 @@ RUN curl -L https://github.com/zeromq/zmqpp/archive/refs/tags/4.2.0.tar.gz | tar
 
 RUN pip3 install 'setuptools>=59.5' sphinx breathe meson
 
-RUN curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master -o master.tar.gz && \
-    mkdir cppzmq-master && tar -zxf master.tar.gz -C cppzmq-master && cd cppzmq-master && \
+RUN mkdir cppzmq-master && \
+    curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master | tar xz -C cppzmq-master/ --strip=1 && \
+    cd cppzmq-master && \
     cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local . && make install
 
 # install photospline

diff --git a/icetray_base/Dockerfile_base-devel-debian-sid b/icetray_base/Dockerfile_base-devel-debian-sid
@@ -34,8 +34,9 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
   && apt-get clean
 
 
-RUN curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master -o master.tar.gz && \
-    mkdir cppzmq-master && tar -zxf master.tar.gz -C cppzmq-master && cd cppzmq-master && \
+RUN mkdir cppzmq-master && \
+    curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master | tar xz -C cppzmq-master/ --strip=1 && \
+    cd cppzmq-master && \
     cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local . && make install
 
 # install photospline

diff --git a/icetray_base/Dockerfile_base-devel-rocky8 b/icetray_base/Dockerfile_base-devel-rocky8
@@ -120,11 +120,10 @@ RUN wget https://github.com/Starlink/pal/releases/download/v0.9.8/pal-0.9.8.tar.
     make && \
     make install
 
-RUN curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master -o master.tar.gz && \
-    tar -zxf master.tar.gz && \
+RUN mkdir cppzmq-master && \
+    curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master | tar xz -C cppzmq-master/ --strip=1 && \
     cd cppzmq-master && \
-    cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local . && \
-    make install
+    cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local . && make install
 
 # install photospline
 RUN curl -L https://github.com/icecube/photospline/archive/refs/tags/v2.1.0.tar.gz | tar xz && \

diff --git a/icetray_base/Dockerfile_base-devel-rocky9 b/icetray_base/Dockerfile_base-devel-rocky9
@@ -115,11 +115,10 @@ RUN wget https://github.com/Starlink/pal/releases/download/v0.9.8/pal-0.9.8.tar.
     make && \
     make install
 
-RUN curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master -o master.tar.gz && \
-    tar -zxf master.tar.gz && \
+RUN mkdir cppzmq-master && \
+    curl -L https://api.github.com/repos/zeromq/cppzmq/tarball/master | tar xz -C cppzmq-master/ --strip=1 && \
     cd cppzmq-master && \
-    cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local . && \
-    make install
+    cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local . && make install
 
 
 # install photospline