@@ -1,8 +1,8 @@

 FROM docs/base:oss

-MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)

+MAINTAINER Docker Docs <docs@docker.com>

 ENV PROJECT=engine

 # To get the git info for this repo

 COPY . /src

-RUN rm -r /docs/content/$PROJECT/

+RUN rm -rf /docs/content/$PROJECT/

 COPY . /docs/content/$PROJECT/

@@ -1,15 +1,4 @@

-.PHONY: all binary build cross default docs docs-build docs-shell shell test test-unit test-integration test-integration-cli test-docker-py validate

-

-# env vars passed through directly to Docker's build scripts

-# to allow things like `make BUILDFLAGS=... binary` easily

-# `docs/sources/contributing/devenvironment.md ` and `project/PACKAGERS.md` have some limited documentation of some of these

-DOCKER_ENVS := \

-	-e BUILDFLAGS \

-	-e DOCKER_GRAPHDRIVER \

-	-e TESTDIRS \

-	-e TESTFLAGS \

-	-e TIMEOUT

-# note: we _cannot_ add "-e DOCKER_BUILDTAGS" here because even if it's unset in the shell, that would shadow the "ENV DOCKER_BUILDTAGS" set in our Dockerfile, which is very important for our official builds

+.PHONY: default docs docs-build docs-shell test

 # to allow `make DOCSDIR=docs docs-shell` (to create a bind mount in docs)

 DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR)/$(DOCSDIR):/$(DOCSDIR))

@@ -43,10 +32,8 @@ docs-draft: docs-build

 docs-shell: docs-build

 	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash

+test: docs-build

+	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)"

 docs-build:

-#	( git remote | grep -v upstream ) || git diff --name-status upstream/release..upstream/docs ./ > ./changed-files

-#	echo "$(GIT_BRANCH)" > GIT_BRANCH

-#	echo "$(AWS_S3_BUCKET)" > AWS_S3_BUCKET

-#	echo "$(GITCOMMIT)" > GITCOMMIT

 	docker build -t "$(DOCKER_DOCS_IMAGE)" .