diff --git a/.ko.yaml b/.ko.yaml index 71317e2..0c7200c 100644 --- a/.ko.yaml +++ b/.ko.yaml @@ -1,5 +1,5 @@ baseImageOverrides: github.com/imjasonh/kontain.me/cmd/ko: golang github.com/imjasonh/kontain.me/cmd/buildpack: gcr.io/buildpacks/builder - github.com/imjasonh/kontain.me/cmd/viz: gcr.io/kontainme/graphviz + github.com/imjasonh/kontain.me/cmd/viz: nixery.dev/graphviz github.com/imjasonh/kontain.me/cmd/api: gcr.io/buildpacks/builder diff --git a/cmd/viz/Dockerfile b/cmd/viz/Dockerfile deleted file mode 100644 index d5b8309..0000000 --- a/cmd/viz/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM alpine - -RUN apk add --update --no-cache \ - ca-certificates \ - graphviz \ - ttf-freefont diff --git a/cmd/viz/main.go b/cmd/viz/main.go index 201cec5..58fb767 100644 --- a/cmd/viz/main.go +++ b/cmd/viz/main.go @@ -11,7 +11,7 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/google/go-containerregistry/pkg/name" - "github.com/google/go-containerregistry/pkg/v1" + v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/tmc/dot" ) @@ -166,7 +166,7 @@ func getLayers(ref name.Reference) ([]v1.Descriptor, error) { } func graphviz(in io.Reader, out io.Writer) error { - cmd := exec.Command("dot", "-Tsvg") + cmd := exec.Command("/bin/dot", "-Tsvg") cmd.Stdin = in cmd.Stdout = out return cmd.Run() diff --git a/deploy.sh b/deploy.sh index 1e9f4e5..31ffaee 100755 --- a/deploy.sh +++ b/deploy.sh @@ -31,11 +31,6 @@ function deploy_mirror() { deploy mirror ;} function deploy_random() { deploy random ;} function deploy_viz() { deploy viz ;} -function build_viz_base() { - docker build -t gcr.io/${project}/graphviz -f cmd/viz/Dockerfile cmd/viz/ - docker push gcr.io/${project}/graphviz -} - case ${1:-"all"} in api) deploy_api;; app) deploy_app;; @@ -44,7 +39,6 @@ case ${1:-"all"} in mirror) deploy_mirror;; random) deploy_random;; viz) deploy_viz;; - viz_base) build_viz_base; deploy_viz;; all) deploy_api @@ -53,7 +47,7 @@ case ${1:-"all"} in deploy_ko deploy_mirror deploy_random - build_viz_base; deploy_viz + deploy_viz ;; esac