diff --git a/.gitignore b/.gitignore index 21dc552..a07d86f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ .idea/ release/ build/ +gcloud/ diff --git a/Dockerfile b/Dockerfile index 2c5bc62..43f571a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN addgroup -S app \ curl openssl netcat-openbsd WORKDIR /home/app - +COPY ./ui ./ui ADD podinfo . RUN chown -R app:app ./ diff --git a/Dockerfile.build b/Dockerfile.build index a822163..e25bdfb 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,5 +1,6 @@ FROM alpine:3.7 +COPY ./ui ./ui ADD podinfo /podinfo CMD ["./podinfo"] diff --git a/Dockerfile.ci b/Dockerfile.ci index 3492a81..41986ce 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -24,7 +24,7 @@ RUN addgroup -S app \ WORKDIR /home/app COPY --from=builder /go/src/github.com/stefanprodan/k8s-podinfo/podinfo . - +COPY ./ui ./ui RUN chown -R app:app ./ USER app diff --git a/Makefile b/Makefile index 053fe5e..c59207a 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,7 @@ build: @echo Building: linux/$(LINUX_ARCH) $(VERSION) ;\ for arch in $(LINUX_ARCH); do \ mkdir -p build/linux/$$arch && CGO_ENABLED=0 GOOS=linux GOARCH=$$arch go build -ldflags="-s -w -X $(GITREPO)/pkg/version.GITCOMMIT=$(GITCOMMIT)" -o build/linux/$$arch/$(NAME) ./cmd/$(NAME) ;\ + cp -r ui/ build/linux/$$arch/ui;\ done .PHONY: tar @@ -45,6 +46,7 @@ docker-build: tar @for arch in $(LINUX_ARCH); do \ mkdir -p build/docker/linux/$$arch ;\ tar -xzf release/$(NAME)_$(VERSION)_linux_$$arch.tgz -C build/docker/linux/$$arch ;\ + cp -r ui/ build/docker/linux/$$arch/ui;\ if [ $$arch == amd64 ]; then \ cp Dockerfile build/docker/linux/$$arch ;\ cp Dockerfile build/docker/linux/$$arch/Dockerfile.in ;\ diff --git a/ui/vue.html b/ui/vue.html new file mode 100644 index 0000000..1cf2a08 --- /dev/null +++ b/ui/vue.html @@ -0,0 +1,170 @@ + + +
+
+