diff --git a/Dockerfile b/Dockerfile index 3527da6..f9cfbbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,3 @@ -FROM quay.io/vektorcloud/glibc:latest - -ARG CTOP_VERSION=0.5 -ENV CTOP_URL https://github.com/bcicen/ctop/releases/download/v${CTOP_VERSION}/ctop-${CTOP_VERSION}-linux-amd64 - -RUN echo $CTOP_URL && \ - wget -q $CTOP_URL -O /ctop && \ - chmod +x /ctop - +FROM scratch +COPY ./ctop /ctop ENTRYPOINT ["/ctop"] diff --git a/Makefile b/Makefile index 53c5e61..ca2ac05 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ build-all: image: docker build -t ctop_build -f Dockerfile_build . docker run -ti --rm -v $(shell pwd):/target ctop_build cp -v /go/bin/ctop /target/ - docker build -t ctop -f Dockerfile_minimal . + docker build -t ctop -f Dockerfile . release: mkdir release diff --git a/circle.yml b/circle.yml index 0f2dbbd..61d181c 100644 --- a/circle.yml +++ b/circle.yml @@ -7,7 +7,7 @@ machine: dependencies: override: - docker info - - docker build --build-arg CTOP_VERSION=$(cat VERSION) -t ctop . + - make image test: override: