Skip to content

Commit 2dc3cd4

Browse files
authored
Merge pull request #678 from utopia-php/feat-mongo-tmp-pulls
Feat mongo tmp pulls
2 parents 641980d + e2b1856 commit 2dc3cd4

31 files changed

+5901
-1360
lines changed

composer.lock

Lines changed: 40 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-compose.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
- ./dev/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini
1818
- /var/run/docker.sock:/var/run/docker.sock
1919
- ./docker-compose.yml:/usr/src/code/docker-compose.yml
20-
- ./vendor/utopia-php/mongo/src/Client.php:/usr/src/code/vendor/utopia-php/mongo/src/Client.php
20+
#- ./vendor/utopia-php/mongo/src/Client.php:/usr/src/code/vendor/utopia-php/mongo/src/Client.php
2121
environment:
2222
PHP_IDE_CONFIG: serverName=tests
2323

@@ -31,7 +31,11 @@ services:
3131
- database
3232

3333
postgres:
34-
image: postgres:16.4
34+
build:
35+
context: .
36+
dockerfile: postgres.dockerfile
37+
args:
38+
POSTGRES_VERSION: 16
3539
container_name: utopia-postgres
3640
networks:
3741
- database
@@ -40,9 +44,14 @@ services:
4044
environment:
4145
POSTGRES_USER: root
4246
POSTGRES_PASSWORD: password
47+
POSTGRES_DB: root
4348

4449
postgres-mirror:
45-
image: postgres:16.4
50+
build:
51+
context: .
52+
dockerfile: postgres.dockerfile
53+
args:
54+
POSTGRES_VERSION: 16
4655
container_name: utopia-postgres-mirror
4756
networks:
4857
- database
@@ -51,6 +60,7 @@ services:
5160
environment:
5261
POSTGRES_USER: root
5362
POSTGRES_PASSWORD: password
63+
POSTGRES_DB: root
5464

5565
mariadb:
5666
image: mariadb:10.11

postgres.dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM postgres:16
2+
3+
RUN apt-get update \
4+
&& apt-get install -y --no-install-recommends \
5+
postgresql-16-postgis-3 \
6+
postgresql-16-postgis-3-scripts \
7+
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)