Skip to content

Conversation

ijc
Copy link
Contributor

@ijc ijc commented Nov 21, 2017

Left over from development

Signed-off-by: Ian Campbell <ijc@docker.com>
name: Fetch binaries
command: |
curl -fsSL -o /workspace/bin/linuxkit https://152-46932243-gh.circle-artifacts.com/0/linuxkit-linux-amd64
curl -fsSL -o /workspace/bin/linuxkit https://183-46932243-gh.circle-artifacts.com/0/linuxkit-linux-amd64
Copy link
Member

Choose a reason for hiding this comment

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

since linuxkit/linuxkit#2761 just got merged do you want to roll that in here and ditch moby

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I guess I should, yes. After I figured out where I went wrong with my yaml-fu for the existing stuff ;-)

Copy link
Member

@rn rn left a comment

Choose a reason for hiding this comment

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

Apart from the suggestion of pulling in linuxkit/linuxkit#2761 this def makes things cleaner. Assuming it's green of course...

@ijc
Copy link
Contributor Author

ijc commented Nov 21, 2017

Sadly it seems like my attempt to use << to factor out the common steps, while technically valid yaml, does not yield the required structure -- you get a nested list for each such construct rather than one single list. Looks like what I want to do isn't actually possible in yaml.

I'll take a look through the circle docs to see if there is a higher level feature which allows this, if not then I'll have to drop the most interesting parts of this PR :-(

Ian Campbell added 6 commits November 21, 2017 10:54
Includes linuxkit/linuxkit#2762 which fixes linuxkit#4.

Signed-off-by: Ian Campbell <ijc@docker.com>
This will be useful to others I expect.

Signed-off-by: Ian Campbell <ijc@docker.com>
Also include all images when listing and use long form of options.

Signed-off-by: Ian Campbell <ijc@docker.com>
Signed-off-by: Ian Campbell <ijc@docker.com>
Since linuxkit/linuxkit#2761 (which we have now picked
up) we can use `linuxkit build` instead. (NB: we don't currently build images in CI)

Signed-off-by: Ian Campbell <ijc@docker.com>
Signed-off-by: Ian Campbell <ijc@docker.com>
@ijc
Copy link
Contributor Author

ijc commented Nov 21, 2017

Yeah, it wasn't possible, force pushed without those nice cleanups.

Also updated to an even newer linuxkit and consequently dropped moby.

Copy link
Member

@rn rn left a comment

Choose a reason for hiding this comment

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

still LGTM if not as nice as the previous (failed) attempt of cleanup

@ijc ijc merged commit 4e695af into linuxkit:master Nov 21, 2017
@ijc
Copy link
Contributor Author

ijc commented Nov 21, 2017

I made a feature request for being able to refactor like I wanted.

@ijc ijc deleted the ci branch November 21, 2017 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot boot kube-master using boot.sh when metadata.json is empty
3 participants