summaryrefslogtreecommitdiffstats
path: root/mcp/patches/docker
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-25 03:09:48 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-25 03:12:22 +0200
commitf870328e38c59375b2b19b1667a4baba0ce31bdb (patch)
tree104b1d00fafef81a78515edcbbf4f19811a5740d /mcp/patches/docker
parent977c33e3d964c681bfa92c7dd520ac07e1ba0a28 (diff)
[build.sh] Fix quotes, missing deb arch for repo
JIRA: FUEL-383 Change-Id: Ie4374d44993bd738b90e9b6e357014d0c5657da0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches/docker')
-rw-r--r--mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch4
1 files changed, 2 insertions, 2 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
index 546e4e9e2..51931b507 100644
--- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
+++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
@@ -23,7 +23,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
1 file changed, 28 insertions(+)
diff --git a/DockerMake.yml b/DockerMake.yml
-index 2c75586..9b044a3 100644
+index 2c75586..4883e2c 100644
--- a/DockerMake.yml
+++ b/DockerMake.yml
@@ -108,6 +108,34 @@ salt-formulas:
@@ -37,7 +37,7 @@ index 2c75586..9b044a3 100644
+ 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 http://apt.mirantis.com/xenial ${SALT_FORMULA_VERSION} salt"
++ 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 \