feat: cleanup vite configs

app/WYGIWYH/settings.py

@@ -318,7 +318,7 @@ DJANGO_VITE_ASSETS_PATH = STATIC_ROOT
 DJANGO_VITE_MANIFEST_PATH = DJANGO_VITE_ASSETS_PATH / "manifest.json"
 DJANGO_VITE_DEV_MODE = DEBUG
 DJANGO_VITE_DEV_SERVER_PORT = 5173
-DJANGO_VITE_DEV_SERVER_HOST = "100.118.164.62"
+DJANGO_VITE_DEV_SERVER_HOST = "localhost"
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field

docker-compose.dev.yml

@@ -9,7 +9,6 @@ services:
       dockerfile: ./docker/dev/django/Dockerfile
     image: wygiwyh_dev_server
     container_name: wygiwyh_dev_server
-    command: /start-supervisor
     volumes:
       - ./app/:/usr/src/app/:z
       - ./frontend/:/usr/src/frontend:z
@@ -20,13 +19,13 @@ services:
       - .env
     depends_on:
       - db
-      - webpack
+      - vite
     restart: unless-stopped
 
-  webpack:
+  vite:
     build:
       context: .
-      dockerfile: ./docker/dev/webpack/Dockerfile
+      dockerfile: ./docker/dev/vite/Dockerfile
     image: wygiwyh_dev_node
     container_name: wygiwyh_dev_node
     volumes:
@@ -34,7 +33,6 @@ services:
       - ./app/:/usr/src/app/
       # http://jdlm.info/articles/2016/03/06/lessons-building-node-app-docker.html
       - /usr/src/frontend/node_modules
-    command: npm run dev
     ports:
       - '${WEBPACK_OUTBOUND_PORT}:5173'
     environment:
@@ -53,13 +51,3 @@ services:
     ports:
       - '${SQL_PORT}:5432'
     restart: unless-stopped
-
-#  procrastinate:
-#    <<: *django
-#    image: wygiwyh_dev_procrastinate
-#    container_name: wygiwyh_dev_procrastinate
-#    depends_on:
-#      - db
-#    ports: [ ]
-#    command: /start-procrastinate
-#    restart: unless-stopped

docker-compose.prod.yml

@@ -1,12 +1,11 @@
 services:
   web:
-    image: wygiwhy_prod:latest
+    image: eitchtee/wygiwyh:latest
     container_name: ${SERVER_NAME}
-    command: /start-single
     ports:
       - "${OUTBOUND_PORT}:8000"
     env_file:
-      - .prod.env
+      - .env
     depends_on:
       - db
     restart: unless-stopped
@@ -21,6 +20,3 @@ services:
       - POSTGRES_USER=${SQL_USER}
       - POSTGRES_PASSWORD=${SQL_PASSWORD}
       - POSTGRES_DB=${SQL_DATABASE}
-
-    env_file:
-      - .prod.env

docker/dev/django/Dockerfile

@@ -41,3 +41,5 @@ RUN sed -i 's/\r$//g' /start && \
     chmod +x /start-supervisor
 
 COPY ./app .
+
+CMD ["/start-supervisor"]

docker/dev/vite/Dockerfile

@@ -7,3 +7,5 @@ COPY ./frontend/package.json .
 RUN npm install --verbose && npm cache clean --force
 
 ENV PATH ./node_modules/.bin/:$PATH
+
+CMD ["npm", "run", "dev"]

docker/prod/django/Dockerfile

@@ -64,3 +64,5 @@ RUN chown -R app:app /usr/src/app && \
 USER app
 
 RUN python manage.py compilemessages --settings "WYGIWYH.settings"
+
+CMD ["/start-single"]

frontend/vite.config.js

@@ -37,7 +37,7 @@ export default defineConfig({
         },
         hmr: false,
         cors: true,
-        origin: 'http://100.118.164.62:5173'
+        origin: 'http://localhost:5173'
     },
 
     resolve: {