Skip to content

Commit

Permalink
Merge pull request #78 from rusenask/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
rusenask committed Aug 5, 2017
2 parents 22fb4dd + 412a177 commit 01d005e
Show file tree
Hide file tree
Showing 281 changed files with 18,084 additions and 4,397 deletions.
6 changes: 6 additions & 0 deletions Dockerfile.local
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM alpine:latest
RUN apk --no-cache add ca-certificates
COPY keel /bin/keel
ENTRYPOINT ["/bin/keel"]

EXPOSE 9300
16 changes: 9 additions & 7 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import:
- package: github.com/rusenask/cron
version: v1.1.0
- package: github.com/rusenask/docker-registry-client
version: ^0.1.0
subpackages:
- registry
- package: github.com/urfave/negroni
Expand Down
30 changes: 27 additions & 3 deletions registry/registry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package registry
import (
"github.com/rusenask/keel/constants"

"testing"

"fmt"
"os"
"testing"
)

func TestDigest(t *testing.T) {
Expand All @@ -29,7 +29,6 @@ func TestDigest(t *testing.T) {
func TestGet(t *testing.T) {
client := New()
repo, err := client.Get(Opts{
// Registry: "https://index.docker.io",
Registry: constants.DefaultDockerRegistry,
Name: "karolisr/keel",
})
Expand All @@ -41,3 +40,28 @@ func TestGet(t *testing.T) {
fmt.Println(repo.Name)
fmt.Println(repo.Tags)
}

var EnvArtifactoryUsername = "ARTIFACTORY_USERNAME"
var EnvArtifactoryPassword = "ARTIFACTORY_PASSWORD"

func TestGetArtifactory(t *testing.T) {

if os.Getenv(EnvArtifactoryUsername) == "" && os.Getenv(EnvArtifactoryPassword) == "" {
t.Skip()
}

client := New()
repo, err := client.Get(Opts{
Registry: "https://keel-docker-local.jfrog.io",
Name: "webhook-demo",
Username: os.Getenv(EnvArtifactoryUsername),
Password: os.Getenv(EnvArtifactoryPassword),
})

if err != nil {
t.Errorf("error while getting repo: %s", err)
}

fmt.Println(repo.Name)
fmt.Println(repo.Tags)
}
2 changes: 2 additions & 0 deletions vendor/github.com/Sirupsen/logrus/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/Sirupsen/logrus/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 16 additions & 7 deletions vendor/github.com/Sirupsen/logrus/alt_exit_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions vendor/github.com/Sirupsen/logrus/appveyor.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/Sirupsen/logrus/formatter.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions vendor/github.com/Sirupsen/logrus/json_formatter.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions vendor/github.com/Sirupsen/logrus/terminal_appengine.go

This file was deleted.

6 changes: 3 additions & 3 deletions vendor/github.com/Sirupsen/logrus/terminal_bsd.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/github.com/Sirupsen/logrus/terminal_linux.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 0 additions & 28 deletions vendor/github.com/Sirupsen/logrus/terminal_notwindows.go

This file was deleted.

21 changes: 0 additions & 21 deletions vendor/github.com/Sirupsen/logrus/terminal_solaris.go

This file was deleted.

Loading

0 comments on commit 01d005e

Please sign in to comment.