summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Kocoloski <adam@kocolosk.net>2018-01-24 13:44:36 -0600
committerGitHub <noreply@github.com>2018-01-24 13:44:36 -0600
commitc3bc95697bc841e6bd898930d3df7ddb1452f75b (patch)
tree904a3587d2f29702683a2b270198780ddd8e9f3f
parentd16f2db901c9b3b24c7189acfec35ec42895bd25 (diff)
downloadcouchdb-c3bc95697bc841e6bd898930d3df7ddb1452f75b.tar.gz
Remove outdated docker targets and docs (#1109)
We removed the Dockerfile in 6e57c43a and moved all Docker-related materials to apache/couchdb-docker, but we never cleaned up the Makefile targets or developer documentation.
-rw-r--r--Makefile18
-rw-r--r--Makefile.win18
-rw-r--r--README-DEV.rst24
3 files changed, 0 insertions, 60 deletions
diff --git a/Makefile b/Makefile
index e95d04419..c8c0b093f 100644
--- a/Makefile
+++ b/Makefile
@@ -211,24 +211,6 @@ dialyze: .rebar
@$(REBAR) -r dialyze $(DIALYZE_OPTS)
-.PHONY: docker-image
-# target: docker-image - Build Docker image
-docker-image:
- @docker build --rm -t couchdb/dev-cluster .
-
-
-.PHONY: docker-start
-# target: docker-start - Start CouchDB in Docker container
-docker-start:
- @docker run -d -P -t couchdb/dev-cluster > .docker-id
-
-
-.PHONY: docker-stop
-# target: docker-stop - Stop Docker container
-docker-stop:
- @docker stop `cat .docker-id`
-
-
.PHONY: introspect
# target: introspect - Check for commits difference between rebar.config and repository
introspect:
diff --git a/Makefile.win b/Makefile.win
index 874ddf411..7ff0ab5c5 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -137,24 +137,6 @@ dialyze: .rebar
@$(REBAR) -r dialyze $(DIALYZE_OPTS)
-.PHONY: docker-image
-# target: docker-image - Build Docker image
-docker-image:
- @docker build --rm -t couchdb\dev-cluster .
-
-
-.PHONY: docker-start
-# target: docker-start - Start CouchDB in Docker container
-docker-start:
- @docker run -d -P -t couchdb\dev-cluster > .docker-id
-
-
-.PHONY: docker-stop
-# target: docker-stop - Stop Docker container
-docker-stop:
- @docker stop `cat .docker-id`
-
-
.PHONY: introspect
# target: introspect - Check for commits difference between rebar.config and repository
introspect:
diff --git a/README-DEV.rst b/README-DEV.rst
index 3587e8586..9cfa1f2ef 100644
--- a/README-DEV.rst
+++ b/README-DEV.rst
@@ -198,30 +198,6 @@ See ``make help`` for more info and useful commands.
Please report any problems to the developer's mailing list.
-Testing a cluster
------------------
-
-We use `Docker <https://docker.io>`_ to safely run a local three node
-cluster all inside a single docker container.
-
-Assuming you have Docker installed and running::
-
- make docker-image
-
-This will create a docker image (tagged 'couchdb/dev-cluster') capable
-of running a joined three node cluster.
-
-To start it up::
-
- make docker-start
-
-A three node cluster should now be running (you can now use ``docker ps``
-to find the exposed ports of the nodes).
-
-To stop it::
-
- make docker-stop
-
Releasing
---------