Rebase with master
original Author: Cory Johns <johnsca@gmail.com> This was a basis of cory's earlier work to resolve divergence between the master branch and devel branch. This now yields a 2 line diff as of this merge point.

original Author: Cory Johns <johnsca@gmail.com> This was a basis of cory's earlier work to resolve divergence between the master branch and devel branch. This now yields a 2 line diff as of this merge point.
Merge pull request #59 from simonklb/issue-57
chown $HOME
juju-solutions · johnsca · chuckbutler · mbruzek · kwmonroe · mbruzek
Unified Split

Showing with 4 additions and 1 deletion.

+1 −1 Dockerfile

+3 −0 charmbox-setup.sh
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM jujusolutions/jujubox:latest
+FROM jujusolutions/jujubox:devel
 MAINTAINER Charles Butler <charles.butler@canonical.com>
 
 ARG JUJU_USER=ubuntu
diff --git a/charmbox-setup.sh b/charmbox-setup.sh
@@ -20,6 +20,9 @@ sudo apt-get install -qy  \
                      rsync  \
                      unzip
 
+# Latest charm deb is in ppa:juju/stable, but our parent box (jujubox:devel)
+# only includes ppa:juju/devel. Add the stable ppa and install charm.
+sudo add-apt-repository -u -y ppa:juju/stable
 sudo apt install --no-install-recommends charm
 
 sudo pip install --upgrade pip six