This is an automated email from the ASF dual-hosted git repository.
engelen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-persistence-r2dbc.git
The following commit(s) were added to refs/heads/main by this push:
new 74cffb3 rename docker container (#125)
74cffb3 is described below
commit 74cffb348116e2974d853b93b5570ae95746dc18
Author: PJ Fanning <[email protected]>
AuthorDate: Tue May 28 12:18:14 2024 +0100
rename docker container (#125)
* rename docker container
* add container name
---
.github/workflows/build-test.yml | 4 ++--
.github/workflows/nightly-tests-pekko1.1.yml | 4 ++--
CONTRIBUTING.md | 4 ++--
docker/docker-compose-postgres.yml | 2 +-
docker/docker-compose-yugabyte.yml | 2 --
docs/src/main/paradox/getting-started.md | 2 +-
6 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index af5719e..982e690 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -100,7 +100,7 @@ jobs:
docker-compose -f docker/docker-compose-postgres.yml up -d
# TODO: could we poll the port instead of sleep?
sleep 10
- docker exec -i docker_postgres-db_1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
+ docker exec -i docker-postgres-db-1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
- name: test
run: sbt ++${{ matrix.SCALA_VERSION }} test
@@ -139,7 +139,7 @@ jobs:
docker-compose -f docker/docker-compose-postgres.yml up -d
# TODO: could we poll the port instead of sleep?
sleep 10
- docker exec -i docker_postgres-db_1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
+ docker exec -i docker-postgres-db-1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
- name: test
run: sbt ++3.3 core/test
diff --git a/.github/workflows/nightly-tests-pekko1.1.yml
b/.github/workflows/nightly-tests-pekko1.1.yml
index 8d655d7..098d8e7 100644
--- a/.github/workflows/nightly-tests-pekko1.1.yml
+++ b/.github/workflows/nightly-tests-pekko1.1.yml
@@ -98,7 +98,7 @@ jobs:
docker-compose -f docker/docker-compose-postgres.yml up -d
# TODO: could we poll the port instead of sleep?
sleep 10
- docker exec -i docker_postgres-db_1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
+ docker exec -i docker-postgres-db-1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
- name: test
run: sbt -Dpekko.build.pekko.version=main ++${{ matrix.SCALA_VERSION
}} test
@@ -137,7 +137,7 @@ jobs:
docker-compose -f docker/docker-compose-postgres.yml up -d
# TODO: could we poll the port instead of sleep?
sleep 10
- docker exec -i docker_postgres-db_1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
+ docker exec -i docker-postgres-db-1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
- name: test
run: sbt -Dpekko.build.pekko.version=main ++3.3 core/test
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e8869d3..1f64bf7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,13 +11,13 @@ docker-compose -f docker/docker-compose-postgres.yml up
```
```
-docker exec -i docker_postgres-db_1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
+docker exec -i docker-postgres-db-1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
```
## Some useful debug queries for Postgres
```
-docker exec -it docker_postgres-db_1 psql -U postgres
+docker exec -it docker-postgres-db-1 psql -U postgres
```
```
diff --git a/docker/docker-compose-postgres.yml
b/docker/docker-compose-postgres.yml
index 0aabd6a..351a6bb 100644
--- a/docker/docker-compose-postgres.yml
+++ b/docker/docker-compose-postgres.yml
@@ -1,7 +1,7 @@
-version: '2.2'
services:
postgres-db:
image: postgres:latest
+ container_name: docker-postgres-db-1
ports:
- 5432:5432
environment:
diff --git a/docker/docker-compose-yugabyte.yml
b/docker/docker-compose-yugabyte.yml
index 9b8b730..97d56b7 100644
--- a/docker/docker-compose-yugabyte.yml
+++ b/docker/docker-compose-yugabyte.yml
@@ -1,5 +1,3 @@
-version: '2'
-
# Local Yugabyte database, see
https://docs.yugabyte.com/latest/deploy/docker/docker-compose/
volumes:
diff --git a/docs/src/main/paradox/getting-started.md
b/docs/src/main/paradox/getting-started.md
index 64d0d09..7770cde 100644
--- a/docs/src/main/paradox/getting-started.md
+++ b/docs/src/main/paradox/getting-started.md
@@ -68,7 +68,7 @@ The ddl script can be run in Docker with:
Postgres:
: ```
-docker exec -i docker_postgres-db_1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
+docker exec -i docker-postgres-db-1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
```
Yugabyte:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
