Alpine provisioner #4529

publicarray · 2018-07-05T22:47:53Z

I cherry-picked the commit at #4106 and added a shell script to add the community repo if it's not already installed. I tried to make it work even if the /etc/apk/repositories file was modified beforehand, but as a result the mirror is hard coded to the official alpine cdn

Signed-off-by: Phillip Whelan <[email protected]>

GordonTheTurtle · 2018-07-05T22:47:54Z

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "alpine" [email protected]:publicarray/machine.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842357248536
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

Signed-off-by: Sebastian Schmidt <[email protected]>

publicarray · 2018-07-08T03:45:33Z

@frebib any comments/suggestions on this pr?

frebib · 2018-07-08T09:03:50Z

In fact I actually need to try machine on an Alpine host so I'll give it another test on Monday and let you know. It's been a while since I last tested it

frebib · 2018-07-08T09:09:04Z

libmachine/provision/alpine.go

@@ -136,6 +136,11 @@ func (provisioner *AlpineProvisioner) Provision(swarmOptions swarm.Options, auth
 		}
 	}

+	log.Debug("Add Community repo")
+	if _, err := provisioner.SSHCommand("if ! apk info docker >/dev/null; then ver=$(awk '{split($1,a,\".\"); print a[1]\".\"a[2]}' /etc/alpine-release); echo \"http://dl-cdn.alpinelinux.org/alpine/v$ver/community\" >> /etc/apk/repositories; apk update; fi"); err != nil {


I feel like this could be better for detecting whether community is enabled. Strictly speaking docker could be installed but community not although I'm not entirely sure in this case that it matters

Would you prefer if ! which docker >/dev/null && ! apk info docker >/dev/null; ...?

I'll think about it. It's probably fine for now

Ok I've added the check in the last commit do you want me to remove it?

Just to summarise what (the updated) script does:
If the docker command is not found and apk can't find docker in any installed repositories via apk info docker we continue to install the community repo. Next we retrieve the major and minor version from /etc/alpine-release. The official mirror (CDN) for the appropriate version is appended to the /etc/apk/repositories file. Finally apk update is used to refresh the local repository database.

I think that this is pretty safe but if you have any ideas to improve this I'm open to improvements.

I just spent some time putting this together, tell me what you think:

grep '^[[:blank:]]*[^#].*community' /etc/apk/repositories || sed -i '/^\s*[^#].*main/{p;s/main/community/;}' /etc/apk/repositories

This checks for the existence of an enabled community repo. If it's not present, it copies the main repository and s/main/community/.

From what I have tested this works in pretty much every case

Yes I think this is much better. Would you like to make the commit so you get credit for the script?

The only way i can think of where this would not work in the highly unlikely case where when 'main' is not installed. Maybe a user tries to run this script from the alpine.iso directly? from memory the iso is mounted as a cdrom and is the sole repository until setup-alpine is run. But again I don't think that will happen.

Oh, hum. I didn't consider that case. Ideally this would be more complex to account for that too. Maybe I should add the extra check in if the main repo doesn't exist either. I'll make a PR to your fork in a minute

I'll have to commit this later, but here is the revised statement:

if ! grep -q '^[[:blank:]]*[^#].*community$' /etc/apk/repositories; then grep -q '^[[:blank:]]*[^#].*main$' /etc/apk/repositories || echo "http://dl-cdn .alpinelinux.org/alpine/v$(cut -d. -f1-2 /etc/alpine-release)/main" >> /etc/apk/repositories; sed -i '/^\s*[^#].*main/{p;s/main/community/;}' /etc/apk/repositories; fi; cat /etc/apk/repositories

frebib · 2018-07-08T09:14:31Z

libmachine/provision/alpine.go

+	case pkgaction.Install, pkgaction.Upgrade:
+		packageAction = "add"
+	case pkgaction.Remove:
+		packageAction = "remove"


$ apk remove ERROR: 'remove' is not an apk command. See 'apk --help'.

This should be:
packageAction = "del"

Yes, thanks

Signed-off-by: Sebastian Schmidt <[email protected]>

publicarray · 2018-07-09T07:45:39Z

Ah 'Signed-off-by:' is missing in some commits. I'll give you push rights to my fork. I think that is the easiest way to fix this.

frebib · 2018-07-09T08:06:43Z

You want me to rebase and sign-off my commits? ~~Is a GPG signature seriously not enough?~~

Ok I think we're good now

Adds a default dl-cdn community repo if main is absent, based on /etc/alpine-release Signed-off-by: Joe Groocock <[email protected]>

publicarray · 2018-07-09T08:32:56Z

Thanks! Yea, I'm also new with this Signed-off-by stuff.
I can't wait for this to get merged and 🚢ed :)

publicarray · 2018-07-13T11:55:44Z

@shin- or @dgageot would you mind looking at this PR?

shin- · 2018-07-13T14:10:22Z

Hi!

Unfortunately, Machine is now in maintenance mode, meaning we're not merging new features or new provisioners anymore.

Thank you for your understanding.

frebib · 2018-07-13T14:24:08Z

Permanently?

shin- · 2018-07-13T19:53:09Z

Permanently?

Barring some dramatic changes at Docker, yes!

frebib · 2018-07-13T19:59:18Z

Well it was nice to have some kind of announcement.

I guess Docker has forgotten what 'community' means.

shin- · 2018-07-13T20:30:00Z

I'm sorry you feel slighted by this - it has been the intended direction for over a year now, even though I'll admit it has been poorly communicated.

I opened #4537 as a more visible announcement, as well as a channel for further discussion.

I think with the backtics the extra escaping is not needed.

frebib

You need to sign-off this commit

publicarray · 2018-07-15T22:53:59Z

@frebib Thanks but since this won't be merged I think it's pointless to sign-off any further commits. I'll keep the fork around and close this PR. Thanks so much on helping though. Much appreciated.

SvenDowideit · 2018-07-16T00:33:19Z

for those of you needing machine, there is some activity in the https://github.com/machine-drivers organisation, and it may make sense for you to work on, and release from https://github.com/machine-drivers/machine...

Add Alpine provisioner, re docker#3951.

2ca6cc5

Signed-off-by: Phillip Whelan <[email protected]>

GordonTheTurtle added the dco/no label Jul 5, 2018

Install community repo if docker is not found in installed repos

09a83ce

Signed-off-by: Sebastian Schmidt <[email protected]>

publicarray force-pushed the alpine branch from 0b36131 to 09a83ce Compare July 5, 2018 22:54

GordonTheTurtle removed the dco/no label Jul 5, 2018

frebib reviewed Jul 8, 2018

View reviewed changes

frebib suggested changes Jul 8, 2018

View reviewed changes

GordonTheTurtle added the dco/no label Jul 8, 2018

Alpine: Fix 'remove' is not an apk command

ac1a6ff

Signed-off-by: Sebastian Schmidt <[email protected]>

publicarray force-pushed the alpine branch from e19c2b0 to ac1a6ff Compare July 8, 2018 09:36

GordonTheTurtle added dco/no and removed dco/no labels Jul 8, 2018

publicarray force-pushed the alpine branch from 69086d1 to cda73df Compare July 9, 2018 07:41

GordonTheTurtle added the dco/no label Jul 9, 2018

Infer the community repo from the main repo URL

2f8587b

Adds a default dl-cdn community repo if main is absent, based on /etc/alpine-release Signed-off-by: Joe Groocock <[email protected]>

frebib force-pushed the alpine branch from cda73df to 2f8587b Compare July 9, 2018 08:16

GordonTheTurtle removed the dco/no label Jul 9, 2018

fix add community repo to /etc/apk/repositories

cdf2165

I think with the backtics the extra escaping is not needed.

GordonTheTurtle added the dco/no label Jul 15, 2018

frebib reviewed Jul 15, 2018

View reviewed changes

publicarray closed this Jul 15, 2018

publicarray mentioned this pull request Nov 26, 2018

Alpine provisioner machine-drivers/machine#11

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Alpine provisioner #4529

Alpine provisioner #4529

publicarray commented Jul 5, 2018

GordonTheTurtle commented Jul 5, 2018

publicarray commented Jul 8, 2018

frebib commented Jul 8, 2018

frebib Jul 8, 2018

publicarray Jul 8, 2018

frebib Jul 8, 2018

publicarray Jul 8, 2018

publicarray Jul 8, 2018 •

edited

Loading

frebib Jul 8, 2018

publicarray Jul 8, 2018 •

edited

Loading

frebib Jul 8, 2018

frebib Jul 8, 2018

frebib Jul 8, 2018

publicarray Jul 8, 2018

publicarray commented Jul 9, 2018

frebib commented Jul 9, 2018 •

edited

Loading

publicarray commented Jul 9, 2018 •

edited

Loading

publicarray commented Jul 13, 2018

shin- commented Jul 13, 2018

frebib commented Jul 13, 2018

shin- commented Jul 13, 2018

frebib commented Jul 13, 2018

shin- commented Jul 13, 2018

frebib left a comment

publicarray commented Jul 15, 2018 •

edited

Loading

SvenDowideit commented Jul 16, 2018

Alpine provisioner #4529

Alpine provisioner #4529

Conversation

publicarray commented Jul 5, 2018

GordonTheTurtle commented Jul 5, 2018

publicarray commented Jul 8, 2018

frebib commented Jul 8, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

publicarray Jul 8, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

publicarray Jul 8, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

publicarray commented Jul 9, 2018

frebib commented Jul 9, 2018 • edited Loading

publicarray commented Jul 9, 2018 • edited Loading

publicarray commented Jul 13, 2018

shin- commented Jul 13, 2018

frebib commented Jul 13, 2018

shin- commented Jul 13, 2018

frebib commented Jul 13, 2018

shin- commented Jul 13, 2018

frebib left a comment

Choose a reason for hiding this comment

publicarray commented Jul 15, 2018 • edited Loading

SvenDowideit commented Jul 16, 2018

publicarray Jul 8, 2018 •

edited

Loading

publicarray Jul 8, 2018 •

edited

Loading

frebib commented Jul 9, 2018 •

edited

Loading

publicarray commented Jul 9, 2018 •

edited

Loading

publicarray commented Jul 15, 2018 •

edited

Loading