From bf2ec3c6b8787eba35c9c208d67aa7de1ea13e80 Mon Sep 17 00:00:00 2001 From: Joao Fernandes Date: Sat, 5 Nov 2016 22:03:20 -0700 Subject: [PATCH] Delete Dockerfile, makefile --- Dockerfile | 11 ----------- Makefile | 51 --------------------------------------------------- 2 files changed, 62 deletions(-) delete mode 100644 Dockerfile delete mode 100644 Makefile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 881bab9f45..0000000000 --- a/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM docs/base:oss -MAINTAINER Docker Docs - -ENV PROJECT=docker-trusted-registry -# To get the git info for this repo -COPY . /src -RUN rm -rf /docs/content/$PROJECT/ -COPY . /docs/content/$PROJECT/ - -# This kludge only exists when run from the DTR repo (useful for testing) -RUN mv -f /docs/content/$PROJECT/apidocgen/ /docs/content/apidocs/ || true diff --git a/Makefile b/Makefile deleted file mode 100644 index df8cece166..0000000000 --- a/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -.PHONY: all default docs docs-build docs-shell shell test - -# to allow `make DOCSDIR=docs docs-shell` (to create a bind mount in docs) -DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR)/$(DOCSDIR):/$(DOCSDIR)) - -# to allow `make DOCSPORT=9000 docs` -DOCSPORT := 8000 - -# Get the IP ADDRESS -DOCKER_IP=$(shell python -c "import urlparse ; print urlparse.urlparse('$(DOCKER_HOST)').hostname or ''") -HUGO_BASE_URL=$(shell test -z "$(DOCKER_IP)" && echo localhost || echo "$(DOCKER_IP)") -HUGO_BIND_IP=0.0.0.0 - -GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) -GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g") -DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN)) - -DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e AWS_S3_BUCKET -e NOCACHE - -# for some docs workarounds (see below in "docs-build" target) -GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null) - -default: docs - -local: docs-build - $(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 \ - -v $(CURDIR):/docs/content/docker-trusted-registry/ \ - -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" \ - hugo server \ - --log=true --watch=true \ - --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP) - -docs: docs-build - $(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP) - -docs-draft: docs-build - $(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --buildDrafts="true" --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP) - -docs-shell: docs-build - $(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash - -test: docs-build - $(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" - -docs-build: - rm -rf ./apidocgen/ - cp -r ../apidocgen/output apidocgen - docker build -t "$(DOCKER_DOCS_IMAGE)" . - -images: - $(MAKE) -C images