From 970597876bc7868b729bca0154fd25726bca9aa7 Mon Sep 17 00:00:00 2001
From: summersamara <summersamara@proton.me>
Date: Wed, 22 Nov 2023 20:57:50 +0100
Subject: [PATCH] Fix docker development:

- Specify elixir version (1.15) in Dockerfile base image

- Add npm package to Dockerfile

- Fix vite server unreachable from outside the docker container:
  issue https://framagit.org/framasoft/mobilizon/-/issues/1225
---
 Dockerfile         | 5 +++--
 docker-compose.yml | 1 +
 vite.config.js     | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

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/docker-compose.yml b/docker-compose.yml
index 9b75aad9a..bba75a6f9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,7 @@ services:
       - ".:/app"
     ports:
       - 4000:4000
+      - 5173:5173
     depends_on:
       - postgres
     environment:
diff --git a/vite.config.js b/vite.config.js
index 10d95904f..446ba8820 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -83,6 +83,9 @@ export default defineConfig(({ command }) => {
   return {
     plugins,
     build,
+    server: {
+      host: isDev ? "0.0.0.0" : "localhost",
+    },
     resolve: {
       alias: {
         "@": path.resolve(__dirname, "./src"),