This commit is contained in:
André Menrath 2023-12-08 13:39:16 +01:00
parent 97f3e78a09
commit 5aed7b57f0
3 changed files with 21 additions and 8 deletions

View file

@ -4,8 +4,7 @@ init:
setup: stop setup: stop
@bash mobilizon/docker/message.sh "Compiling everything" @bash mobilizon/docker/message.sh "Compiling everything"
# docker-compose run --rm mobilizon bash -c 'mix hex.config unsafe_https true; mix deps.get; npm ci; npm run build:pictures' docker-compose run --rm -e HEX_UNSAFE_HTTPS=1 mobilizon bash -c 'mix hex.config unsafe_https true; mix deps.get; npm ci; npm run build:pictures; mix ecto.create; mix ecto.migrate'
docker-compose run --rm mobilizon bash -c 'mix ecto.create; mix ecto.migrate'
migrate: migrate:
docker-compose run --rm mobilizon mix ecto.migrate docker-compose run --rm mobilizon mix ecto.migrate
logs: logs:

View file

@ -37,12 +37,13 @@ services:
build: build:
context: ./mobilizon context: ./mobilizon
dockerfile: Dockerfile dockerfile: Dockerfile
args:
- HEX_UNSAFE_HTTPS=1
volumes: volumes:
- "./mobilizon:/app" - "./mobilizon:/app"
- "~/.local/share/mkcert/:/root/.local/share/mkcert/:ro" - "~/.local/share/mkcert/:/root/.local/share/mkcert/:ro"
ports: - /etc/ssl/certs:/etc/ssl/certs:ro
- 4000:4000 - /etc/ca-certificates/:/etc/ca-certificates/:ro
- 5173:5173
depends_on: depends_on:
- postgres - postgres
environment: environment:
@ -59,10 +60,16 @@ services:
MOBILIZON_DATABASE_DBNAME: mobilizon MOBILIZON_DATABASE_DBNAME: mobilizon
MOBILIZON_DATABASE_HOST: postgres MOBILIZON_DATABASE_HOST: postgres
MOBILIZON_DATABASE_PORT: 5432 MOBILIZON_DATABASE_PORT: 5432
VITE_HOST: ${VITE_HOST:-0.0.0.0} HEX_UNSAFE_HTTPS: 1
command: sh -c "mix hex.config unsafe_https true; mix phx.server" HEX_CACERTS_PATH: /etc/ssl/certs
VITE_HOST: 0.0.0.0
command: sh -c "HEX_UNSAFE_HTTPS=1 mix phx.server"
ports:
- "4000:4000"
- "5173:5173"
expose: expose:
- "4000" - "4000"
- "5173"
wordpress: wordpress:
build: build:

View file

@ -7,7 +7,14 @@ http {
server { server {
listen 80; listen 80;
server_name wp.lan; server_name wp.lan;
return 301 https:/$host$request_uri; index index.php;
location / {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass "http://wordpress";
}
} }
server { server {