make docs

Signed-off-by: Arno Uhlig <arno.uhlig@sap.com>
thanos-io · May 13, 2019 · 6253d02 · 6253d02
1 parent cf2398a
commit 6253d02
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM quay.io/prometheus/busybox:latest
 LABEL maintainer="The Thanos Authors"
 
-COPY .build/linux-amd64/thanos /bin/thanos
+COPY thanos /bin/thanos
 
 ENTRYPOINT [ "/bin/thanos" ]
diff --git a/Makefile b/Makefile
@@ -116,7 +116,7 @@ crossbuild: $(PROMU)
 
 # docker builds docker with no tag.
 .PHONY: docker
-docker:
+docker: build
 	@echo ">> building docker image '${DOCKER_IMAGE_NAME}'"
 	@docker build -t "${DOCKER_IMAGE_NAME}" .
 

diff --git a/docs/storage.md b/docs/storage.md
@@ -275,8 +275,6 @@ config:
   project_domain_name: ""
   region_name: ""
   container_name: ""
-  tenant_id: ""
-  tenant_name: ""
 ```
 
 ## Other minio supported S3 object storages