Move add-apt-repository call to Dockerfile

Signed-off-by: Kris Jacque <kris.jacque@intel.com>
daos-stack · Sep 27, 2024 · 11ac499 · 11ac499
1 parent b1ee4cf
commit 11ac499
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/utils/docker/Dockerfile.ubuntu b/utils/docker/Dockerfile.ubuntu
@@ -22,6 +22,9 @@ RUN echo "APT::Get::Assume-Yes \"true\";" > /etc/apt/apt.conf.d/no-prompt
 RUN echo "APT::Install-Recommends \"false\";" > /etc/apt/apt.conf.d/no-recommends
 RUN apt-get update && \
     apt-get upgrade && \
+    apt-get install gpg-agent software-properties-common && \
+    add-apt-repository ppa:longsleep/golang-backports && \
+    apt-get update && \
     chmod +x /tmp/install.sh && \
     /tmp/install.sh && \
     apt-get clean all

diff --git a/utils/scripts/install-ubuntu.sh b/utils/scripts/install-ubuntu.sh
@@ -14,11 +14,6 @@ set -e
 
 arch=$(uname -i)
 
-# DAOS requires newer golang version than the one available in core ubuntu repo
-apt-get install gpg-agent software-properties-common
-add-apt-repository ppa:longsleep/golang-backports
-apt update
-
 apt-get install \
     autoconf \
     build-essential \