diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-11-21 16:57:10 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-11-29 15:16:02 +0000 |
commit | bf4d4728dd3ec729aa79fc0935239e5fda007fd7 (patch) | |
tree | 20678dabbc7d076a2a617a4dca79d844899a43bf /mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch | |
parent | 6ca645482675c02d3534b10cd57202ec3151848c (diff) |
[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>
(cherry picked from commit f03a33bc58135acc7e4420efaaf34c26a32d6142)
Diffstat (limited to 'mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch')
-rw-r--r-- | mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch deleted file mode 100644 index a96c24b1f..000000000 --- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch +++ /dev/null @@ -1,87 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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 | 38 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 36 insertions(+), 2 deletions(-) - -diff --git a/DockerMake.yml b/DockerMake.yml -index 2c75586..13813a2 100644 ---- a/DockerMake.yml -+++ b/DockerMake.yml -@@ -94,7 +94,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 -@@ -102,12 +102,46 @@ salt-formulas: - ENV SALT_ENV_PATH_ $SALT_ENV_PATH_ - ARG RECLASS_BASE="/srv/salt/reclass" - ENV RECLASS_BASE $RECLASS_BASE -- RUN echo "Layer python/salt module prerequisites, formulas" \ -+ RUN echo "Layer python/salt module prerequisites, formulas (09 Nov 2018)" \ - && mkdir -p /srv/salt \ - && curl -sSqL https://raw.githubusercontent.com/salt-formulas/salt-formulas-scripts/master/formula-fetch.sh -o /srv/salt/formula-fetch.sh \ - && 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 |