missing curl

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
rse-ops · Sep 16, 2021 · 1eb7075 · 1eb7075
1 parent 0832e21
commit 1eb7075
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 23 deletions.
diff --git a/ubuntu/16.04/Dockerfile b/ubuntu/16.04/Dockerfile
@@ -10,19 +10,21 @@ ENV TZ=America/Los_Angeles
 LABEL maintainer="David Beckingsale <david@llnl.gov>,@vsoch"
 
 RUN apt-get -qq update && \
-    apt-get -qq install -y --no-install-recommends wget \
-      python-dev \ 
-      python3-pip \
+    apt-get -qq install -y --no-install-recommends \
       build-essential \
-      sudo \
-      git \
-      vim \
+      ca-certificates \
+      curl \
       dh-autoreconf \
-      ninja-build \
+      git \
+      gnupg2 \
       libssl-dev \
-      ca-certificates \
+      ninja-build \
+      python-dev \ 
+      python3-pip \
+      sudo \
       valgrind \
-      gnupg2 
+      vim \
+      wget
 
 # Install spack
 WORKDIR /opt

diff --git a/ubuntu/18.04/Dockerfile b/ubuntu/18.04/Dockerfile
@@ -9,19 +9,20 @@ ENV TZ=America/Los_Angeles
 
 RUN apt-get -qq update && \
     apt-get -qq install -y --no-install-recommends \
-      wget \
-      python3-dev \
-      python3-pip \
       build-essential \
-      sudo \
-      git \
-      vim \
+      ca-certificates \
+      curl \
       dh-autoreconf \
-      ninja-build \
+      git \
+      gnupg2 \
       libssl-dev \
-      ca-certificates \
+      ninja-build \
+      python-dev \ 
+      python3-pip \
+      sudo \
       valgrind \
-      gnupg2
+      vim \
+      wget
 
 # Install spack
 WORKDIR /opt

diff --git a/ubuntu/20.04/Dockerfile b/ubuntu/20.04/Dockerfile
@@ -9,22 +9,24 @@ ENV TZ=America/Los_Angeles
 
 RUN apt-get -qq update && \
     apt-get -qq install -fy tzdata && \
-    apt-get -qq install -fy --no-install-recommends \
+    apt-get -qq install -y --no-install-recommends \
       build-essential \
       ca-certificates \
       curl \
       dh-autoreconf \
       git \
+      gnupg2 \
       lcov \
+      libssl-dev \
       ninja-build \
       pkg-config \
-      python3-dev \
+      python-dev \ 
       python3-pip \
-      libssl-dev \
       sudo \
+      valgrind \
+      vim \
       wget \
-      xsltproc \
-      gnupg2
+      xsltproc
 
 # Install Clingo for Spack
 RUN python3 -m pip install --upgrade pip && \