Skip to content

Commit e706058

Browse files
committed
chore: revert docker-compose, .gitignore, uv.lock to main
1 parent cc8b10a commit e706058

4 files changed

Lines changed: 984 additions & 1016 deletions

File tree

.gitignore

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,13 @@ target/
8585
profile_default/
8686
ipython_config.py
8787

88+
# pipenv
89+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
90+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
91+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
92+
# install all needed dependencies.
93+
#Pipfile.lock
94+
8895
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
8996
__pypackages__/
9097

@@ -145,12 +152,3 @@ dmypy.json
145152
config.json
146153
cron.json
147154
temp.json
148-
149-
# Playwright artifacts
150-
test-results
151-
__screenshots__
152-
playwright-report
153-
blob-report
154-
155-
# qfdmod (unrelated monorepo subfolder)
156-
qfdmod/

docker-compose.yml

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -11,51 +11,13 @@ services:
1111
volumes:
1212
- postgres_data:/var/lib/postgresql/data
1313

14-
garage:
15-
image: dxflrs/garage:v2.3.0
16-
ports:
17-
- "3900:3900" # S3-compatible API
18-
- "3902:3902" # S3 web (browser access)
19-
volumes:
20-
- garage_data:/data
21-
- ./garage/garage.toml:/etc/garage.toml:ro
22-
environment:
23-
GARAGE_DEFAULT_ACCESS_KEY: GKarageKEY00000000000000000
24-
GARAGE_DEFAULT_SECRET_KEY: GKarageSECRETe1087f810d44b283bd7a61077c363893
25-
GARAGE_DEFAULT_BUCKET: sites-conformes-media
26-
command: ["/garage", "server", "--single-node", "--default-bucket"]
27-
28-
garage-bootstrap:
29-
image: alpine:3.20
30-
profiles:
31-
- bootstrap
32-
depends_on:
33-
garage:
34-
condition: service_started
35-
command:
36-
- sh
37-
- -c
38-
- |
39-
apk add --no-cache curl >/dev/null 2>&1
40-
echo ""
41-
echo "Garage S3 cluster — ready!"
42-
echo ""
43-
echo "Use these in your .env:"
44-
echo " S3_HOST=garage:3900"
45-
echo " S3_KEY_ID=GKarageKEY00000000000000000"
46-
echo " S3_SECRET_KEY=GKarageSECRETe1087f810d44b283bd7a61077c363893"
47-
echo " S3_BUCKET_NAME=sites-conformes-media"
48-
echo " S3_BUCKET_REGION=fr"
49-
echo " S3_PROTOCOL=http"
50-
echo " (do NOT set S3_PUBLIC_HOST — presigned URLs work via garage:3900)"
51-
5214
web:
5315
build: .
5416
user: "1000:1000"
5517
env_file:
5618
- .env
5719
environment:
58-
DATABASE_URL: postgres://${DATABASE_USER}:***@db:${DATABASE_PORT}/${DATABASE_NAME}
20+
DATABASE_URL: postgres://${DATABASE_USER}:${DATABASE_PASSWORD}@db:${DATABASE_PORT}/${DATABASE_NAME}
5921
ports:
6022
- "${HOST_PORT}:${HOST_PORT}"
6123
volumes:
@@ -65,13 +27,9 @@ services:
6527
extra_hosts:
6628
- "host.docker.internal:host-gateway"
6729
depends_on:
68-
db:
69-
condition: service_started
70-
garage:
71-
condition: service_started
30+
- db
7231

7332
volumes:
7433
postgres_data:
7534
medias:
7635
staticfiles:
77-
garage_data:

qfdmod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit f333ee42907eba1e9de20ef1ae3d8d101bc04050

0 commit comments

Comments
 (0)