Skip to content
This repository has been archived by the owner on Sep 26, 2021. It is now read-only.

Alpine provisioner #4529

Closed
wants to merge 5 commits into from
Closed

Alpine provisioner #4529

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ca6cc5
Add Alpine provisioner, re docker/machine#3951.
pwhelan May 28, 2017
09a83ce
Install community repo if docker is not found in installed repos
publicarray Jul 5, 2018
ac1a6ff
Alpine: Fix 'remove' is not an apk command
publicarray Jul 8, 2018
2f8587b
Infer the community repo from the main repo URL
frebib Jul 8, 2018
cdf2165
fix add community repo to /etc/apk/repositories
publicarray Jul 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions libmachine/provision/alpine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (provisioner *AlpineProvisioner) dockerDaemonResponding() bool {
return true
}

func (provisioner *AlpineProvisioner) Service(name string, action serviceaction.ServiceAction) error {
func (provisioner *AlpineProvisioner) Service(name string, action serviceaction.ServiceAction) error {
var command string
switch action {
case serviceaction.Start, serviceaction.Restart, serviceaction.Stop:
Expand All @@ -98,7 +98,7 @@ func (provisioner *AlpineProvisioner) Service(name string, action serviceaction.
case serviceaction.Disable:
command = fmt.Sprintf("sudo rc-update del %s boot", name)
}

if _, err := provisioner.SSHCommand(command); err != nil {
return err
}
Expand Down Expand Up @@ -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 {
Copy link

Choose a reason for hiding this comment

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

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

Copy link
Author

Choose a reason for hiding this comment

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

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

Copy link

Choose a reason for hiding this comment

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

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

Copy link
Author

Choose a reason for hiding this comment

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

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

Copy link
Author

@publicarray publicarray Jul 8, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

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.

Copy link

Choose a reason for hiding this comment

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

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

Copy link
Author

@publicarray publicarray Jul 8, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

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.

Copy link

Choose a reason for hiding this comment

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

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

Copy link

Choose a reason for hiding this comment

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

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

return err
}

log.Debug("Installing docker")
if err := provisioner.Package("docker", pkgaction.Install); err != nil {
return err
Expand Down Expand Up @@ -170,4 +175,4 @@ func (provisioner *AlpineProvisioner) Provision(swarmOptions swarm.Options, auth
}

return nil
}
}