Skip to content

Commit ad031a9

Browse files
beepsoftpoikilothermpdurbinstevenwinship
authored
Container naming fix (#11936)
* Use same container names for both mvn/docker compose run dev installations Make sure that running dev containers either via `mvn -Pct docker:run` or `docker compose -f docker-compose-dev.yml up` will result in the same, predictable container names. Before this fix, mvn started containers had names like dataverse-1, while docker compose started containers had dev_dataverse. After this fix, in all cases, we will have dev_dataverse, or more precisely the name used in docker-compose-dev.yml * update container names to dev_ in guides #11936 --------- Co-authored-by: Oliver Bertuch <[email protected]> Co-authored-by: Philip Durbin <[email protected]> Co-authored-by: Steven Winship <[email protected]>
1 parent c325662 commit ad031a9

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

doc/sphinx-guides/source/container/dev-usage.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,13 @@ Accessing Harvesting Log Files
145145

146146
\1. Open a terminal and access the Dataverse container.
147147

148-
Run the following command to access the Dataverse container (assuming your container is named dataverse-1):
148+
Run the following command to access the Dataverse container:
149149

150150
.. code-block::
151151
152-
docker exec -it dataverse-1 bash
152+
docker exec -it dev_dataverse bash
153153
154-
This command opens an interactive shell within the dataverse-1 container.
154+
This command opens an interactive shell within the dev_dataverse container.
155155

156156
\2. Navigate to the log files directory.
157157

doc/sphinx-guides/source/developers/tips.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Here's an example of using these credentials from within the PostgreSQL containe
124124

125125
.. code-block:: bash
126126
127-
pdurbin@beamish dataverse % docker exec -it postgres-1 bash
127+
pdurbin@beamish dataverse % docker exec -it dev_postgres bash
128128
root@postgres:/# export PGPASSWORD=secret
129129
root@postgres:/# psql -h localhost -U dataverse dataverse
130130
psql (16.3 (Debian 16.3-1.pgdg120+1))

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,6 +1266,7 @@
12661266
</image>
12671267
</images>
12681268
<autoCreateCustomNetworks>true</autoCreateCustomNetworks>
1269+
<containerNamePattern>%a</containerNamePattern>
12691270
</configuration>
12701271
</plugin>
12711272
<plugin>

0 commit comments

Comments
 (0)