Simplify docker images down to three variants #44

lox · 2017-01-28T02:51:38Z

This extends on #38.

It simplifies down to three basic alpine based images, latest (stable), beta and experimental. Each contains the relevant agent and some basic stuff like su-exec, docker (client 1.13), jq and curl.

Images end up at around 230 MB.

lox · 2017-01-28T02:57:05Z

@toolmantim it looks like the edge image at https://download.buildkite.com/agent/experimental/3.0-beta.10.1323/buildkite-agent-linux-amd64 is returning a dynamically linked binary, so it's failing the test.

This at least verifies that it's worth having a test rather than auto-building via Docker Hub which I was seriously considering :)

lox · 2017-01-28T03:15:50Z

I updated to the latest experimental build and everything works fine.

lox · 2017-01-28T03:29:47Z

Using https://docs.docker.com/compose/install/#install-as-a-container for installing docker-compose.

toolmantim · 2017-01-29T23:52:11Z

Nice work! What was too hard about a local install of docker-compose?

This at least verifies that it's worth having a test rather than auto-building via Docker Hub which I was seriously considering :)

Something we can do is trigger the Docker Hub build from the Buildkite pipeline (they have a URL you can curl to kick it off), rather than on the GitHub change. If we wanted to do that.

sj26 · 2017-01-30T00:12:14Z

This is looking nice! 👌

toolmantim · 2017-01-30T00:16:02Z

.buildkite/steps/release.sh

+done
+
+# variants of beta 3.0-beta.9
+for tag in 3.0-beta.9 3.0 3 ; do


beta 9 or 16?

lox · 2017-02-09T01:57:19Z

So what do we have to do to move this forward?

lox · 2017-02-09T05:43:16Z

I've pushed images to https://hub.docker.com/r/lox24/buildkite-agent/ for this PR.

lox · 2017-02-09T05:43:49Z

Going to do some testing on a PR on https://github.com/buildkite/elastic-ci-stack-for-aws

lox · 2017-02-09T09:11:38Z

Btw @toolmantim, the hard bit about docker-compose is that it needs python installed. The current solution is a shim script that calls a docker-compose docker image, but I think that might end up being too complicated.

toolmantim · 2017-02-13T21:54:26Z

This seems almost ready for release!

The labels look the same, and I can't spot anything else that's a breaking change, aside from removing DIND.

I wonder what the best solution is for people wanting to add DIND support? Perhaps building your own custom image?

FROM buildkite/agent

ADD https://raw.githubusercontent.com/docker/docker/v.13.1/hack/dind /usr/local/bin
RUN chmod +x /usr/local/bin/dind

# copy and pasted from buildkite/agent base, with "dind" added
ENTRYPOINT ["dind", "/sbin/tini", "-g", "--", "ssh-env-config.sh", "/usr/local/bin/buildkite-agent"]

toolmantim · 2017-02-13T21:59:02Z

Related to @blueimp’s feedback in #38, perhaps instead of entrypoint.d we just wrap up our ENTRYPOINT commands in a single buildkite-agent-entrypoint executable so it can easily be called from images that build upon it?

So the above DIND example would become:

FROM buildkite/agent

ADD https://raw.githubusercontent.com/docker/docker/v.13.1/hack/dind /usr/local/bin
RUN chmod +x /usr/local/bin/dind

ENTRYPOINT ["dind", "buildkite-agent-entrypoint"]

Or does tini need to be at the beginning?

lox · 2017-02-15T00:25:46Z

IMO this is good to go. We might just need some docs updated.

blueimp · 2017-02-15T11:03:57Z

@toolmantim
Yes, tini should be the first entrypoint binary so it can run as PID 1 and reap zombies.

toolmantim · 2017-02-16T00:55:15Z

Thanks @blueimp.

Okay, so I believe the updated DIND example would be this then:

FROM buildkite/agent

RUN curl -sL https://github.com/docker/docker/raw/v1.13.1/hack/dind > /docker-entrypoint.d/dind \
    && chmod +x /docker-entrypoint.d/dind

toolmantim · 2017-02-16T01:22:06Z

README.md

+
+There is a wrapper script in the container that invokes a container for docker-compose. This is done to keep the image small, as docker-compose requires a python environment.
+
+Using it requires that you mount a volume into the container for `/buildkite`, and pass in the name of that volume as an env called ``.


Does this mean that you can now only use docker-compose if you've created a docker volume and mounted it into /buildkite? Whereas before, it'd Just Work™?

Oh this needs to be updated. I ended up going back to installing docker-compose directly. Adds about 90M to the image, but I think it's worth it.

Cool! I think so too.

toolmantim · 2017-02-19T23:28:40Z

README.md

@@ -4,20 +4,18 @@ Docker images for the [Buildkite Agent](https://github.com/buildkite/agent). A v

 > If you don't need to run the agent on a purely Docker-based operating system (such as Kubernetes), and instead just want to [run your builds inside Docker containers](https://buildkite.com/docs/guides/docker-containerized-builds), then we recommend using one of the standard installers (such as `apt`). See the [containerized builds guide](https://buildkite.com/docs/guides/docker-containerized-builds) for more information.

-The Buildkite Agent is available via an Alpine Linux based image, with either the stable, beta or experimental versions of the Buildkite Agent, with or without docker:
+The Buildkite Agent is built on Alpine Linux, with either the stable, beta or experimental versions of the Buildkite Agent, with or without docker:


I think we axe with or without docker now yeah?

toolmantim · 2017-02-19T23:50:34Z

README.md

@@ -76,6 +65,10 @@ A less-recommended approach is to use the built-in [docker-ssh-env-config](https

 Another approach is to use the [environment agent hook](https://buildkite.com/docs/agent/hooks) to pull down the key into the container’s file system before the `git checkout` occurs. Note: the key will exist in Docker’s file system unless it is destroyed.

+## Customizing the image on boot
+
+The default entrypoint will look for any scripts in `/docker-entrypoint.d/` and run them. This allows for bootstrap scripts to be mounted into the agent to install things (via apk or pip) before the agent starts.


What about:

## Entrypoint customizations The entrypoint uses `tini` to correctly pass signals to, and kill, sub-processes. Instead of redefining `ENTRYPOINT` we recommend you copy executable scripts into `/docker-entrypoint.d/`. All executable scripts in that directory will be executed in alphanumeric order.

toolmantim · 2017-02-19T23:51:22Z

README.md


-If in doubt, go with `buildkite/agent`—it's the smallest, most stable, and includes the docker client.
+If in doubt, go with `buildkite/agent:latest`—it's the most stable, and includes the docker client.


Any reason for :latest here?

toolmantim · 2017-02-19T23:57:41Z

@rimusz do you know how this will affect https://github.com/buildkite/helm-charts? This removes DIND support from buildkite/agent. I noticed "Helm Classic" is the old world, so perhaps we need to deprecate the helm-charts anyhow?

rimusz · 2017-02-21T08:44:12Z

@toolmantim do not worry about the DIND removal, helm-charts repo will get new Helm v2 chart soon

lox · 2017-02-21T10:34:44Z

Updated docs @toolmantim

toolmantim · 2017-02-23T21:36:03Z

This looks great!

The last bit that I can see is that now is that we're versioning these images with the agent version, and we'll need to update the release process too so it's automated from the agent pipeline.

At the moment we just trigger the Docker pipeline and it rebuilds all images every time, no matter if it's a stable, beta or experimental release.

We can probably feed the agent version and SHA256 to the pipeline via the trigger, and have it automatically update the Readme & Dockerfiles via the GitHub API, which would trigger its own build?

So, perhaps 2 pipelines…

pipeline.yml (tests and releases via GitHub events)
pipeline.bump-version.yml (GitHub API update via trigger from agent release pipeline)

The agent pipeline does the GitHub API stuff for the homebrew recipe at the moment. Though it's a bit gross.

toolmantim · 2017-02-23T21:37:08Z

@rimusz thanks for clarifying!

toolmantim

🚀 It's time!

lox force-pushed the simplify-images-lox branch from 3db4d25 to 00c1841 Compare January 28, 2017 02:55

toolmantim reviewed Jan 30, 2017

View reviewed changes

.buildkite/steps/release.sh Outdated

done

# variants of beta 3.0-beta.9

for tag in 3.0-beta.9 3.0 3 ; do

Copy link

Contributor

toolmantim Jan 30, 2017

Choose a reason for hiding this comment

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

beta 9 or 16?

lox changed the title ~~[WIP] Clean up images - Lox~~ Clean up images - Lox Feb 9, 2017

toolmantim mentioned this pull request Feb 14, 2017

[WIP] Clean up images #38

Closed

2 tasks

toolmantim changed the title ~~Clean up images - Lox~~ Clean up images - take II Feb 14, 2017

toolmantim mentioned this pull request Feb 14, 2017

Don't error if tini compat wrapper isn't there #46

Closed

toolmantim and others added 13 commits February 15, 2017 10:55

New minimal Alpine images

23f0941

Rename images to unstable/beta

60c3eb8

Update README file

09a5f14

Add basic test script

0da8c93

Minimize layers in Dockerfiles

7128823

Remove older alpine images

387a64e

Edge uses experimental/latest now

07059a5

Add a basic release script

8b20e07

Don't pin docker, add in docker-compose

7a154eb

Add in jq

2067390

Remove docker-compose, too hard!

70e2bf1

Add docker-compose via "install as container"

fd50e16

Test docker socket

f717327

lox added 5 commits February 15, 2017 10:55

Bump to 3.0-beta.16

f499d6c

Extract versions for tags based on the agent version

ed452af

Add a dedicated compose wrapper

41247fc

Update docs

eba490b

Install docker-compose via pip

32b2d99

lox force-pushed the simplify-images-lox branch from 61d23b3 to 6531dad Compare February 15, 2017 00:06

toolmantim reviewed Feb 16, 2017

View reviewed changes

lox changed the title ~~Clean up images - take II~~ Simplify docker images down to three variants Feb 19, 2017

lox added 3 commits February 19, 2017 19:50

Move entrypoint commands into /usr/local/bin/buildkite-agent-entrypoint

4a21ce7

Add support for /docker-entrypoint.d/*

017d6cb

Update docs for built-in docker-compose

ff9a3f0

lox force-pushed the simplify-images-lox branch from 7269fed to ff9a3f0 Compare February 19, 2017 08:53

lox added 4 commits February 19, 2017 19:57

Fix incorrect volume path in docker-compose.yml

a09f95a

Pass correct arguments to run-parts

6479dd3

Fail entrypoint if entrypoint.d fails

13afdbe

Updated docs about docker-entrypoint.d

b40edc4

toolmantim reviewed Feb 19, 2017

View reviewed changes

Use alpine:3.5 rather than edge

23ae219

Updated docs as per PR comments

d0343e3

toolmantim approved these changes Mar 7, 2017

View reviewed changes

lox merged commit f1df91c into master Mar 8, 2017

lox deleted the simplify-images-lox branch March 8, 2017 00:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Simplify docker images down to three variants #44

Simplify docker images down to three variants #44

lox commented Jan 28, 2017 •

edited

Loading

lox commented Jan 28, 2017

lox commented Jan 28, 2017

lox commented Jan 28, 2017

toolmantim commented Jan 29, 2017

sj26 commented Jan 30, 2017

toolmantim Jan 30, 2017

lox commented Feb 9, 2017

lox commented Feb 9, 2017

lox commented Feb 9, 2017

lox commented Feb 9, 2017

toolmantim commented Feb 13, 2017 •

edited

Loading

toolmantim commented Feb 13, 2017 •

edited

Loading

lox commented Feb 15, 2017

blueimp commented Feb 15, 2017

toolmantim commented Feb 16, 2017

toolmantim Feb 16, 2017

lox Feb 16, 2017

toolmantim Feb 16, 2017

toolmantim Feb 19, 2017

toolmantim Feb 19, 2017

toolmantim Feb 19, 2017

toolmantim commented Feb 19, 2017

rimusz commented Feb 21, 2017

lox commented Feb 21, 2017

toolmantim commented Feb 23, 2017

toolmantim commented Feb 23, 2017

toolmantim left a comment


		There is a wrapper script in the container that invokes a container for docker-compose. This is done to keep the image small, as docker-compose requires a python environment.

		Using it requires that you mount a volume into the container for `/buildkite`, and pass in the name of that volume as an env called ``.


		If in doubt, go with `buildkite/agent`—it's the smallest, most stable, and includes the docker client.
		If in doubt, go with `buildkite/agent:latest`—it's the most stable, and includes the docker client.

Simplify docker images down to three variants #44

Simplify docker images down to three variants #44

Conversation

lox commented Jan 28, 2017 • edited Loading

lox commented Jan 28, 2017

lox commented Jan 28, 2017

lox commented Jan 28, 2017

toolmantim commented Jan 29, 2017

sj26 commented Jan 30, 2017

toolmantim Jan 30, 2017

Choose a reason for hiding this comment

lox commented Feb 9, 2017

lox commented Feb 9, 2017

lox commented Feb 9, 2017

lox commented Feb 9, 2017

toolmantim commented Feb 13, 2017 • edited Loading

toolmantim commented Feb 13, 2017 • edited Loading

lox commented Feb 15, 2017

blueimp commented Feb 15, 2017

toolmantim commented Feb 16, 2017

toolmantim Feb 16, 2017

Choose a reason for hiding this comment

lox Feb 16, 2017

Choose a reason for hiding this comment

toolmantim Feb 16, 2017

Choose a reason for hiding this comment

toolmantim Feb 19, 2017

Choose a reason for hiding this comment

toolmantim Feb 19, 2017

Choose a reason for hiding this comment

toolmantim Feb 19, 2017

Choose a reason for hiding this comment

toolmantim commented Feb 19, 2017

rimusz commented Feb 21, 2017

lox commented Feb 21, 2017

toolmantim commented Feb 23, 2017

toolmantim commented Feb 23, 2017

toolmantim left a comment

Choose a reason for hiding this comment

lox commented Jan 28, 2017 •

edited

Loading

toolmantim commented Feb 13, 2017 •

edited

Loading

toolmantim commented Feb 13, 2017 •

edited

Loading