diff --git a/.env.template b/.env.template index 203f7e5c1..e398060b7 100644 --- a/.env.template +++ b/.env.template @@ -22,3 +22,6 @@ MOBILIZON_SMTP_PORT=25 MOBILIZON_SMTP_USERNAME=noreply@mobilizon.lan MOBILIZON_SMTP_PASSWORD=password MOBILIZON_SMTP_SSL=false + +# When using docker for development, VITE_HOST must be set to 0.0.0.0 +VITE_HOST=localhost diff --git a/Dockerfile b/Dockerfile index 749a0f8f9..54ef7f267 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,10 @@ -FROM elixir:alpine +FROM elixir:1.15-alpine -RUN apk add --no-cache inotify-tools postgresql-client file make gcc libc-dev argon2 imagemagick cmake build-base libwebp-tools bash ncurses git python3 +RUN apk add --no-cache inotify-tools postgresql-client file make gcc libc-dev argon2 imagemagick cmake build-base libwebp-tools bash ncurses git python3 npm RUN mix local.hex --force && mix local.rebar --force WORKDIR /app EXPOSE 4000 +EXPOSE 5173 diff --git a/config/dev.exs b/config/dev.exs index 1d3f99eef..429a84391 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -15,7 +15,9 @@ config :mobilizon, Mobilizon.Web.Endpoint, check_origin: false, watchers: [ node: [ - "node_modules/.bin/vite" + "node_modules/.bin/vite", + "--host", + System.get_env("VITE_HOST", "localhost") ] ] diff --git a/docker-compose.yml b/docker-compose.yml index 9b75aad9a..8723b6e7b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,6 +19,7 @@ services: - ".:/app" ports: - 4000:4000 + - 5173:5173 depends_on: - postgres environment: @@ -35,6 +36,7 @@ services: MOBILIZON_DATABASE_DBNAME: ${POSTGRES_DB} MOBILIZON_DATABASE_HOST: postgres MOBILIZON_DATABASE_PORT: ${POSTGRES_PORT} + VITE_HOST: ${VITE_HOST:-localhost} command: sh -c "mix phx.server" volumes: pgdata: