From f03a33bc58135acc7e4420efaaf34c26a32d6142 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Wed, 21 Nov 2018 16:57:10 +0100
Subject: [docker] build: Allow cache invalidation

While at it, fix emoji issues with latest virtualenv [1].

JIRA: FUEL-398

[1] https://github.com/pypa/pipenv/issues/3223

Change-Id: Ice5937222bf75c1ddadc6b9f1994635bc10faf57
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 ...03-OPNFV-package-installation-Ubuntu-user.patch | 88 ++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch

(limited to 'mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch')

diff --git a/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch
new file mode 100644
index 000000000..d283d06b6
--- /dev/null
+++ b/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch
@@ -0,0 +1,88 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Wed, 22 Aug 2018 01:35:06 +0200
+Subject: [PATCH] OPNFV package installation, Ubuntu user
+
+* Install OpenSSH server (and client), so other OPNFV projects can
+  easily connect to the Salt master node;
+* Install 'salt-formula-gnocchi' distro package (empty git formula
+  workaround);
+* While at it, create 'ubuntu' user so other OPNFV projects don't
+  have to switch to 'root' login;
+* Preinstall `salt_minion_dependency_packages` and
+  `salt_minion_reclass_dependencies`;
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ DockerMake.yml | 37 ++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 36 insertions(+), 1 deletion(-)
+
+diff --git a/DockerMake.yml b/DockerMake.yml
+index 2c75586..eb06cbd 100644
+--- a/DockerMake.yml
++++ b/DockerMake.yml
+@@ -29,6 +29,7 @@ common-cleanup:
+
+ common:
+   build: |
++    ARG CACHE_INVALIDATE="0"
+     RUN echo "Layer with common packages" \
+       && eval ${LAYER_PKGUPDT} \
+       && apt-get upgrade -qy \
+@@ -94,7 +95,7 @@ salt-formulas:
+   build: |
+     ARG SALT_FORMULA_VERSION="master"
+     ENV SALT_FORMULA_VERSION $SALT_FORMULA_VERSION
+-    ARG SALT_FORMULA_SOURCES="https://github.com/salt-formulas https://github.com/saltstack-formulas"
++    ARG SALT_FORMULA_SOURCES="https://github.com/salt-formulas"
+     ENV SALT_FORMULA_SOURCES $SALT_FORMULA_SOURCES
+     ARG SALT_FORMULAS_BASE="/srv/salt/formula"
+     ENV SALT_FORMULAS_BASE $SALT_FORMULAS_BASE
+@@ -108,6 +109,40 @@ salt-formulas:
+       && bash -c 'source /srv/salt/formula-fetch.sh && setupPyEnv && fetchAll' \
+       && eval ${LAYER_CLEANUP}
+
++opnfv:
++  build: |
++    # Some formulas have empty git repos, use the package version
++    ARG SALT_FORMULA_VERSION="nightly"
++    ENV SALT_FORMULA_VERSION $SALT_FORMULA_VERSION
++    ARG SALT_FORMULA_LIST="salt-formula-gnocchi"
++    ENV SALT_FORMULA_LIST $SALT_FORMULA_LIST
++    ENV APT_REPOSITORY "deb [arch=amd64] http://apt.mirantis.com/xenial ${SALT_FORMULA_VERSION} salt"
++    ENV APT_REPOSITORY_GPG "http://apt.mirantis.com/public.gpg"
++    RUN echo "Layer extra salt-formulas packages" \
++      && echo "$APT_REPOSITORY" | tee /etc/apt/sources.list.d/salt-formulas.list >/dev/null \
++      && curl -sL $APT_REPOSITORY_GPG | $SUDO apt-key add - \
++      && eval ${LAYER_PKGUPDT} \
++      && ${LAYER_INSTALL} ${SALT_FORMULA_LIST} -y --fix-missing -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
++      && eval ${LAYER_CLEANUP}
++    RUN echo "Layer with OPNFV packages" \
++      && eval ${LAYER_PKGUPDT} \
++      && ${LAYER_INSTALL} \
++           gawk \
++           inetutils-ping \
++           kmod \
++           net-tools \
++           openssh-server \
++           python-m2crypto \
++           python-msgpack \
++           python-netaddr \
++           python-oauth \
++           python-psutil \
++           python-yaml \
++      && useradd -m ubuntu \
++      && echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/ubuntu \
++      && eval ${LAYER_CLEANUP}
++
++
+ wheel:
+   requires:
+     - base
-- 
cgit 1.2.3-korg