mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-27 20:31:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3 from Clever/publish-latest

Browse source 
Also publish "latest" image
This commit is contained in:
kvigen 2014-06-25 15:09:16 -07:00
commit 022a8b3908
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/plugin/publish/docker.go
View file

@ -51,8 +51,9 @@ func (d *Docker) Write(f *buildfile.Buildfile, r *repo.Repo) {
dockerServerUrl := d.Server + ":" + strconv.Itoa(d.Port) dockerServerUrl := d.Server + ":" + strconv.Itoa(d.Port)
splitRepoName := strings.Split(r.Name, "/") splitRepoName := strings.Split(r.Name, "/")
dockerRepo := d.RepoBaseName + "/" + splitRepoName[len(splitRepoName) - 1] dockerRepo := d.RepoBaseName + "/" + splitRepoName[len(splitRepoName) - 1]
// Run the command commands to build and deploy the image. Note that the image is tagged // Run the command commands to build and deploy the image. Note that we both create a new image
// with the git hash. // tagged with the git hash as well as update the "latest" image.
f.WriteCmd(fmt.Sprintf("docker -H %s build -t %s - < %s", dockerServerUrl, dockerRepo, d.Dockerfile))
f.WriteCmd(fmt.Sprintf("docker -H %s build -t %s:$(git rev-parse --short HEAD) - < %s", f.WriteCmd(fmt.Sprintf("docker -H %s build -t %s:$(git rev-parse --short HEAD) - < %s",
dockerServerUrl, dockerRepo, d.Dockerfile)) dockerServerUrl, dockerRepo, d.Dockerfile))

6
pkg/plugin/publish/docker_test.go
View file

@ -58,9 +58,13 @@ func TestValidYaml(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Can't unmarshal script: %s", err.Error()) t.Fatalf("Can't unmarshal script: %s", err.Error())
} }
if !strings.Contains(response, "docker -H server:1000 build -t base_repo/name - <") {
t.Fatalf("Response: " + response + " doesn't contain build command for latest")
}
if !strings.Contains(response, "docker -H server:1000 build -t base_repo/name" + if !strings.Contains(response, "docker -H server:1000 build -t base_repo/name" +
":$(git rev-parse --short HEAD)") { ":$(git rev-parse --short HEAD)") {
t.Fatalf("Response: " + response + "doesn't contain build command") t.Fatalf("Response: " + response + "doesn't contain build command for commit hash")
} }
if !strings.Contains(response, "docker -H server:1000 login -u user -p password -e email") { if !strings.Contains(response, "docker -H server:1000 login -u user -p password -e email") {
t.Fatalf("Response: " + response + " doesn't contain login command") t.Fatalf("Response: " + response + " doesn't contain login command")