Skip to content
This repository has been archived by the owner on May 14, 2020. It is now read-only.

Add Ubuntu Based DIND Agent #11

Merged
merged 12 commits into from
Aug 25, 2016
Merged

Add Ubuntu Based DIND Agent #11

merged 12 commits into from
Aug 25, 2016

Conversation

colin-msphere
Copy link
Contributor

Add a docker-in-docker agent based on Ubuntu. This provides a typical glibc environment, whereas alpine uses musl.

Add a docker-in-docker agent based on Ubuntu. This
provides a typical glibc environment, whereas alpine
uses musl.
@colin-msphere
Copy link
Contributor Author

retest this please

@ghost
Copy link

ghost commented Aug 8, 2016

Please rename Dockerfile to Dockerfile.alpine, switch to spaces instead of tabs, and align all backspaces in the Dockerfile. We'll also want to add/modify a build script to handle Dockerfile.*.

Now that there are multiple images available, rename
Dockerfile to Dockerfile.alpine. This matches the naming
style of Dockerfile.ubuntu.
lvm2 \
lxc \
openjdk-8-jre-headless \
unzip \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: can these \s be aligned?

@ghost
Copy link

ghost commented Aug 9, 2016

Is there a build script or build script changes that can be committed as part of this PR as well?

@colin-msphere
Copy link
Contributor Author

@rji - there are no build scripts currently in this repo. Would you suggest a script that builds everything, a script per image, or an update to the README with build instructions?

@ghost
Copy link

ghost commented Aug 9, 2016

A single script that builds everything.

Add a script to build all Docker images. This script leverages
git to create the tag name.

Added a .dockerignore file to prevent scripts from being considered
in the docker build context.
Remove commented out code.
jq \
lvm2 \
lxc \
openjdk-8-jre-headless \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: align \s

@ghost
Copy link

ghost commented Aug 10, 2016

Could we make the script also do a docker login and docker push?

@colin-msphere
Copy link
Contributor Author

I am adding a push piece, but I would like to leave login out and let the user handle that.

@ghost
Copy link

ghost commented Aug 10, 2016

Good point, that sounds good to me. Thanks @colin-msphere!

@ghost
Copy link

ghost commented Aug 10, 2016

Looking at the build script and how it's tagging and pushing images, this appears to tag the images using a convention like mesosphere/jenkins-dind:alpine and mesosphere/jenkins-dind:ubuntu. However, up to this point we've tagged the images with a version number and we have a CI job that builds and pushes the images to Docker Hub when a new tag is pushed to this repo.

I'm not sure that we can safely abandon our previous versioning scheme since it could lead to inconsistencies in users' environments (for example: using an older, cached image on one machine and pulling down a newer version on a machine where the image isn't already cached). I also don't think it's wise to recommend that users force pull this image every time a CI build needs to take place.

Allow the tag prefix to be passed in as a third parameter.
@sschneid sschneid merged commit 8bb5531 into master Aug 25, 2016
@sschneid sschneid deleted the ubuntu-dind branch August 25, 2016 20:13
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants