From d4771df69b0de0f4f24d12785d43dc61b54f05ed Mon Sep 17 00:00:00 2001
From: "James P. Ketrenos" <james.p.ketrenos@intel.com>
Date: Tue, 24 Sep 2019 11:25:14 -0700
Subject: [PATCH] Moved around template order

Signed-off-by: James P. Ketrenos <james.p.ketrenos@intel.com>
---
 templates/20-agama-packages.in | 19 +++++++++++++++++++
 templates/25-agama-user.in     | 22 ++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 templates/20-agama-packages.in
 create mode 100644 templates/25-agama-user.in

diff --git a/templates/20-agama-packages.in b/templates/20-agama-packages.in
new file mode 100644
index 0000000..7d6fba1
--- /dev/null
+++ b/templates/20-agama-packages.in
@@ -0,0 +1,19 @@
+FROM base AS agama
+
+# Update and install gpg-agent as it isn't in the base Ubuntu image and is needed for apt-key
+RUN apt-get -q update \
+  && DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -q -y install \
+    wget \
+    gpg-agent \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
+
+# Fetch and install the signing key for OSGC's Agama repository
+RUN wget --no-proxy --quiet -O /tmp/aptly.key http://osgc.jf.intel.com/packages/agama/ubuntu/aptly_repo_signing.key \
+  && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn apt-key add /tmp/aptly.key \
+  && rm /tmp/aptly.key
+
+# Add internal Agama repository
+RUN apt-add-repository "deb [arch=amd64] http://osgc.jf.intel.com/packages/agama/ubuntu disco main"
+
+RUN apt-get remove -y wget
diff --git a/templates/25-agama-user.in b/templates/25-agama-user.in
new file mode 100644
index 0000000..8422a19
--- /dev/null
+++ b/templates/25-agama-user.in
@@ -0,0 +1,22 @@
+# Create user 'agama' and add them to 'sudo' for sudo access and set
+# the passwd to 'agama'
+
+FROM agama AS agama-user
+
+RUN apt-get -q update \
+  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+    sudo \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
+
+# NOTE: Requires 'sudo' package to already be installed
+RUN groupadd -r agama \
+&& useradd --no-log-init \
+  -s /bin/bash \
+  -r -m \
+  -g agama \
+  -G sudo \
+  -p $(echo "agama" | openssl passwd -stdin) agama
+
+# Set 'sudo' to NOPASSWD for all container users
+RUN sed -i -e 's,%sudo.*,%sudo ALL=(ALL) NOPASSWD:ALL,g' /etc/sudoers