summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Lankton <zachlankton@gmail.com>2022-08-17 15:33:13 +0000
committerNick Vatamaniuc <nickva@users.noreply.github.com>2022-08-19 22:32:36 -0400
commit7fabe4bfb3523f44942e3ea0a185e17e2ef96950 (patch)
treeacae13dc4a7c0832b9a3839039c6f7c684769662
parentb9afb4590a5cf31a67cfe13c341eecb64dea0102 (diff)
downloadcouchdb-7fabe4bfb3523f44942e3ea0a185e17e2ef96950.tar.gz
update variable name and readme
-rw-r--r--.devcontainer/Dockerfile4
-rw-r--r--.devcontainer/devcontainer.json2
-rw-r--r--README-DEV.rst3
-rw-r--r--README.rst3
4 files changed, 7 insertions, 5 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 46a09d0cf..2670d8795 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
-ARG IMG
-FROM ${IMG}
+ARG COUCHDB_IMAGE
+FROM ${COUCHDB_IMAGE}
# Install SpiderMonkey 78 and tell CouchDB to use it in configure
ENV SM_VSN=78
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5dbf45dbd..0c581315a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -9,7 +9,7 @@
// apache/couchdbci-debian:bullseye-erlang-24.3.4.2
// apache/couchdbci-debian:bullseye-erlang-23.3.4.15
//
- "IMG": "apache/couchdbci-debian:bullseye-erlang-25.0.2"
+ "COUCHDB_IMAGE": "apache/couchdbci-debian:bullseye-erlang-25.0.2"
}
},
diff --git a/README-DEV.rst b/README-DEV.rst
index 84e16def7..e29d632f5 100644
--- a/README-DEV.rst
+++ b/README-DEV.rst
@@ -76,7 +76,8 @@ and spin up a dev container for use.
This ``devcontainer`` will automatically run ``./configure && make`` the first time it is created.
While this may take some extra time to spin up, this tradeoff means you will be able to
-run things like ``./dev/run`` and ``make check`` straight away. Subsequent startups should be quick.
+run things like ``./dev/run``, ``./dev/run --admin=admin:admin``, ``./dev/run --with-admin-party-please``,
+and ``make check`` straight away. Subsequent startups should be quick.
Debian-based (inc. Ubuntu) Systems
diff --git a/README.rst b/README.rst
index 6bb69cd09..d06904fe8 100644
--- a/README.rst
+++ b/README.rst
@@ -74,7 +74,8 @@ and spin up a dev container for use.
This ``devcontainer`` will automatically run ``./configure && make`` the first time it is created.
While this may take some extra time to spin up, this tradeoff means you will be able to
-run things like ``./dev/run`` and ``make check`` straight away. Subsequent startups should be quick.
+run things like ``./dev/run``, ``./dev/run --admin=admin:admin``, ``./dev/run --with-admin-party-please``,
+and ``make check`` straight away. Subsequent startups should be quick.
**Manual Dev Setup:**