From f07e4649b6228acf406857b7cb65f2b84ba66c1c Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Mon, 2 Jan 2017 20:13:32 +0100
Subject: Fix docker installation and clone from docs-agl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ifb6eb061515faf665a1ff06d599da795267deb7d
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 packer/provision/agl_dependencies.sh | 40 +++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 12 deletions(-)

(limited to 'packer')

diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index 320619ae..c0f99b2d 100644
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -17,7 +17,7 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \
     apt-get -y install gawk wget git-core diffstat unzip texinfo gcc-multilib build-essential chrpath socat \
                        libsdl1.2-dev xterm make xsltproc docbook-utils fop dblatex xmlto autoconf automake \
                        libtool libglib2.0-dev libarchive-dev python-git git python python-minimal repo \
-                       tree rsync python-yaml python-requests curl tar docker pandoc python3 \
+                       tree rsync python-yaml python-requests curl tar docker.io pandoc python3 \
                        ruby-all-dev ruby-ffi ruby-ffi-* jekyll ruby-redcarpet npm mkdocs nodejs
 
 
@@ -53,11 +53,13 @@ EOFSYSCTL
 ### webdocs
 mkdir -p /opt/AGL
 cd /opt/AGL/
-mkdir webdocs
-cd webdocs
-git clone http://github.com/iotbzh/webdocs-tools
-git clone http://github.com/iotbzh/webdocs-sample
-cd ./webdocs-tools
+#mkdir webdocs
+#cd webdocs
+#git clone http://github.com/iotbzh/webdocs-tools
+#git clone http://github.com/iotbzh/webdocs-sample
+git clone https://github.com/automotive-grade-linux/docs-agl
+
+cd ./docs-agl/doctools/webdocs/
 npm install
 gem install --no-user-install -V kramdown
 
@@ -72,6 +74,23 @@ sed -i '16iimport ssl' lava-boot
 sed -i '17issl._create_default_https_context = ssl._create_unverified_context' lava-boot
 sed -i -e 's#"~/.lava.yaml"#"/opt/AGL/lava-agl/lava.yaml"#' lava-boot
 
+cat <<EOFLAVAYAML > /opt/AGL/lava-agl/.lava.yaml
+server: ${LAVAHOST}
+user: ${LAVAUSER}
+token: ${LAVATOKEN}
+https: true
+EOFLAVAYAML
+
+
+
+
+
+exit 0
+
+if false ; then
+
+# ATTIC
+
 
 # AGL specific lab integration. To be moved into git repo and cloned or the like.
 #################################################################################
@@ -138,12 +157,6 @@ while True:
 # end
 EOFBR
 
-cat <<EOFLAVAYAML > /opt/AGL/lava-agl/.lava.yaml
-server: ${LAVAHOST}
-user: ${LAVAUSER}
-token: ${LAVATOKEN}
-https: true
-EOFLAVAYAML
 
 cat <<EOFPORTERUPLOADYAML > /opt/AGL/lava-agl/porter_nbd_upload.yaml
 actions:
@@ -316,3 +329,6 @@ fi
 EOFDEPLOY
 
 chmod a+x /opt/AGL/lava-agl/*
+
+
+fi
\ No newline at end of file
-- 
cgit 1.2.3-korg