/jujubox

make new devel branch #28

Merged
merged 25 commits into from Nov 29, 2016

Conversation

Reviewers

@chuckbutler chuckbutler

@mbruzek mbruzek

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
4 participants
@kwmonroe @chuckbutler @mbruzek @tvansteenburgh
@kwmonroe
Member

kwmonroe commented Nov 29, 2016

Now that master represents the latest stable jujubox, merge it into our devel branch. Then add ppa:juju/devel so jujubox:devel will install the latest devel version of juju.

tvansteenburgh and others added some commits Jun 12, 2015

@tvansteenburgh
Add juju-local dep
814593c
@tvansteenburgh
s/whitmo/jujusolutions/
4472cb3
@tvansteenburgh
Install python-jujuclient
d310d98
@mbruzek
Making the changes to bring devel changes to master now that Juju 2.x… 
… has been released.
7e89cf9
@mbruzek
Replacing local with LXD since this is Juju 2.0
216ba20
@mbruzek
Updating the change for version 2.0
bcfad02
@mbruzek
Adding the charms directory and clarifying README.md
2472426
@chuckbutler
Merge pull request #18 from mbruzek/juju-2.x-update 
Changes to bring devel to master now that Juju 2.x has been released.
e42ebb5
@mbruzek
Using USER, ENV, and ENTRYPOINT cleans up the Dockerfile.
a4a1019
@chuckbutler
Merge pull request #19 from mbruzek/ENV-USER-ENTRYPOINT 
Using USER, ENV, and ENTRYPOINT cleans up the Dockerfile.
c0c4db3
@mbruzek
Adding ARG to optionally build with any user.
37e037b
@mbruzek
Changed ADD to COPY per review comment.
8a5fde9
@kwmonroe
Merge pull request #21 from mbruzek/docker-arg-juju-user 
Adding ARG to optionally build with any user for master.
3b9e966
@mbruzek
Removing unused packages, and disabling strict host checking.
39f8836
@mbruzek
Adding a Makefile and a shell script test.
fb8cc7a
@mbruzek
Merge pull request #25 from mbruzek/remove-packages-disable-host-chec… 
…king

Removing unused packages, and disabling strict host checking.
5bfde4c
@chuckbutler
Merge pull request #26 from mbruzek/add-simple-test 
Add simple test
666952f
@mbruzek
Adding Travis speciification for CI testing.
81d1e66
@mbruzek
Ignore the .travis.yml file when building.
a86f9f8
@mbruzek
Adding one more thing!
9cda5b4
@chuckbutler
Merge pull request #27 from mbruzek/travis 
Travis
691790a
@kwmonroe
Merge branch 'master' into devel-to-master 
master now has the most up-to-date jujubox. sync this with the devel branch
so that we can use it to deliver a current jujubox with ppa:juju/devel.

All checks have passed

2 successful checks
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
0aa0b68
@kwmonroe
add ppa:juju/devel

All checks have passed

2 successful checks
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
81be4c1
@kwmonroe
adjust test to tag image with devel

All checks have passed

2 successful checks
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
864dc58

kwmonroe added a commit to juju-solutions/charmbox that referenced this pull request Nov 29, 2016

@kwmonroe
Merge branch 'master' into devel-from-master 
Sync devel with master (master is our most up-to-date juju2 branch). Then
update the Dockerfile to pull from jujubox:devel.

Depends on juju-solutions/jujubox#28
0098c5f

@kwmonroe kwmonroe referenced this pull request in juju-solutions/charmbox Nov 29, 2016

Merged

update devel branch #69

setup.sh
# stable ppa is required for charm-tools
-apt-add-repository -y ppa:juju/stable
-apt-get update -qq
+apt-add-repository -u -y ppa:juju/stable
@mbruzek

mbruzek Nov 29, 2016

Contributor

We may be able to remove the stable from here if you only want devel juju

@kwmonroe

kwmonroe Nov 29, 2016

Member

i was going off the comment from master that said stable was required for charm-tools. It appears that the stable ppa has a more recent version of c-t (2.1.9):

https://launchpad.net/~juju/+archive/ubuntu/stable

Versus devel's version of c-t (2.1.2):

https://launchpad.net/~juju/+archive/ubuntu/devel

Unless you know better, I think we want stable in there to pick up the most current charm-tools.

@chuckbutler

chuckbutler Nov 29, 2016

Contributor

That can be added in the downstream box image that requires this. It makes more sense to encapsulate that there rather htan here in a lower layer, where its inclusion is effectively hidden unless there are other reasons for having both PPA's enabled in jujubox.

@kwmonroe

kwmonroe Nov 29, 2016

Member

Ahhh, i see. charm-tools is no longer installed in jujubox, and downstream charmbox installs it from git with pip.

I'll remove the stable ppa and see if that breaks anything else from setup.sh and charmbox.

@kwmonroe
remove ppa:juju/stable 
No need to include stable juju ppa since we only care about the latest juju
devel release in jujubox:devel.

All checks have passed

2 successful checks
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
5335967
@kwmonroe
Member

kwmonroe commented Nov 29, 2016 •
Edited 1 time

Tested local jujubox:devel and charmbox:devel after removing ppa:juju/stable. Both look good.
@chuckbutler
Contributor

chuckbutler commented Nov 29, 2016

This sounds and looks good to me if its +1 by @mbruzek. Cursory glance and build was LGTM

@chuckbutler chuckbutler added the enhancement label Nov 29, 2016

@mbruzek
Contributor

mbruzek commented Nov 29, 2016

Yeah this now looks like something we can use.

@mbruzek mbruzek merged commit f2a6e8c into devel Nov 29, 2016
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@kwmonroe kwmonroe deleted the devel-from-master branch Nov 29, 2016

@kwmonroe kwmonroe referenced this pull request in juju-solutions/charmbox Dec 9, 2016

Merged

add juju/stable to get latest version of charm #72

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment