ci: Docker plugin #440
ci: Docker plugin #440
Conversation
Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
This plugin provides the ability to build Docker images, including builds where one built image is used as the base image for another. Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
|
|
||
| module Image = struct | ||
| type t = { | ||
| id : string; |
There was a problem hiding this comment.
It would be useful to unify this with https://github.com/avsm/mirage-ci/blob/master/src/docker_build.mli#L14 so that we have one type for Docker images within the CI. I separated out the sha256 (which is queried after the image is built) from the textual tag, and added a human-readable string as well to describe the purpose of the file (this is probably optional).
|
|
||
| let branch_safe_char = function | ||
| | ':' -> '-' | ||
| | x -> x |
There was a problem hiding this comment.
Could branch_safe_char be exposed elsewhere for other plugins to use? Or is there any reason why the results of branch shouldnt always be run through this for all plugins?
There was a problem hiding this comment.
Depending on the way the branch is generated, replacing characters automatically could make the branch names non-unique. Possibly we should define some custom escaping scheme (in Irmin) and apply it everywhere.
| | None -> "" | ||
| | Some from -> "-from-" ^ String.map branch_safe_char (Image.id from) | ||
| in | ||
| Printf.sprintf "docker-build-%s-of-%s%s" t.label (CI_git.hash src) from |
There was a problem hiding this comment.
Can be Fmt.strf for consistency
| | None -> Lwt.return () | ||
| | Some base -> | ||
| Lwt_io.with_file ~mode:Lwt_io.input path (fun ch -> Lwt_io.read ch) >>= fun contents -> | ||
| match String.cut ~sep:"\n" contents with |
There was a problem hiding this comment.
Do we need to filter for String.is_prefix ~affix:"#" here as well, to account for comments before the FROM ?
There was a problem hiding this comment.
I could easily switch my Dockerfile.t generator to use this version, by generating a file. That also has the advantage that it would make scripting easier as I could create a temporary directory for COPY commands to work as well. However, I would need sha256 image id tracking after a build...
|
This one does store the sha256 after the build. It uses the somewhat hacky method of building it twice - once normally to get log output and then again with |
|
After discussion with @avsm I'm tempted to merge this now, as the builds are broken without it. The comment thing should be supported at some point, but we might prefer to use a proper Dockerfile parser rather than hacky string matching, and the current code will give a clear error if it gets an unsupported format. |
|
lgtm, I dont think this clashes with anything I'm doing. I've created ocurrent/ocaml-dockerfile#2 to track the Dockerfile parser request in the library. |
This plugin provides the ability to build Docker images, including builds where one built image is used as the base image for another. This is needed to test DataKit itself (needed to make #439 go green!).
Note that @avsm has a more sophisticated Docker plugin at https://github.com/avsm/mirage-ci/ for when the Dockerfile is generated by the CI. This PR's plugin handles the simple case of a project which already has a hand-written Dockerfile.