docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3535 from tronicum/fedora-version 

bumped version up to fedora 23 (should'nt it use a matching versi…
This commit is contained in:
Nathan LeClaire 2016-06-23 17:28:54 -07:00 committed by GitHub
parent 9c4a8a93a1 5c888874e0
commit cdd8c86e41
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmachine/provision/fedora_test.go
View File

@ -17,12 +17,12 @@ func TestFedoraGenerateYumRepoList(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
m, err := regexp.MatchString(".*fedora/22.*", buf.String()) m, err := regexp.MatchString(".*fedora/23.*", buf.String())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if !m { if !m {
t.Fatalf("expected match for fedora/22") t.Fatalf("expected match for fedora/23")
} }
} }

2
libmachine/provision/redhat.go
View File

@ -248,7 +248,7 @@ func generateYumRepoList(provisioner Provisioner) (*bytes.Buffer, error) {
packageListInfo.OsReleaseVersion = "7" packageListInfo.OsReleaseVersion = "7"
case "fedora": case "fedora":
packageListInfo.OsRelease = "fedora" packageListInfo.OsRelease = "fedora"
packageListInfo.OsReleaseVersion = "22" packageListInfo.OsReleaseVersion = "23"
case "ol": case "ol":
packageListInfo.OsRelease = "oraclelinux" packageListInfo.OsRelease = "oraclelinux"
v := majorVersionRE.FindStringSubmatch(releaseInfo.Version) v := majorVersionRE.FindStringSubmatch(releaseInfo.Version)