Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
774566e
- pre-prepared files
Blusia Apr 9, 2025
3ec5e98
- update .env's for dev
Blusia Apr 17, 2025
ce4dec7
- update dev Taskfile
Blusia Apr 17, 2025
fc426a0
- update Dockerfile
Blusia Apr 17, 2025
e01fcfd
- added vite.dev
Blusia Apr 17, 2025
66aa038
- spaces
Blusia Apr 17, 2025
fcaaf88
- update renovate.json5
Blusia Apr 17, 2025
bfff650
- update image registry in dev workflow
Blusia Apr 17, 2025
7f33490
- update Dockerfile
Blusia Apr 18, 2025
147e173
- add UserSeeder
Blusia Apr 18, 2025
c3c8ac9
Merge remote-tracking branch 'origin/main' into add-dev-environment
Blusia Apr 23, 2025
831c62a
- update imege registry for dev deployment
Blusia Apr 23, 2025
dd01911
- update imege registry for dev deployment
Blusia Apr 23, 2025
51a69de
- rename vite env for dev
Blusia Apr 23, 2025
fd38e9b
- update Dockerfile
Blusia Apr 23, 2025
c177a70
- update dev deployment files
Blusia Apr 23, 2025
bf6736c
- update .env.dev
Blusia Apr 24, 2025
456f7c7
- add trustProxies to app.php
Blusia Apr 24, 2025
848bf0e
- remove UserSeeder.php
Blusia Apr 24, 2025
073d8f5
- fixing 403 on non local environment
EwelinaSkrzypacz Apr 24, 2025
ca59a7d
- update .env.dev and .env.example
Blusia Apr 24, 2025
724b043
- update dev secrets
Blusia Apr 24, 2025
aa9814c
- update dev secrets
Blusia Apr 24, 2025
f0d1d7c
- fix
Blusia Apr 24, 2025
c528837
- update Dockerfile, changed path for frontend build stage
Blusia Apr 25, 2025
4e2d13f
- remove sleep 5 from Taskfile
Blusia Apr 25, 2025
46937b6
- add SOPS for dev in .env.example
Blusia Apr 25, 2025
ad772fb
- update Dockerfile
Blusia Apr 25, 2025
2aa6051
- update dev php.ini
Blusia Apr 25, 2025
9a73b74
- add middlewares to docker-compose.dev.yml
Blusia Apr 25, 2025
21ad4ec
- update .env.dev
Blusia Apr 25, 2025
8230fed
- update readme.md
Blusia Apr 25, 2025
ea855c6
- update readme.md
Blusia May 5, 2025
7f8fadc
- remove old prod deployment files
Blusia May 6, 2025
2ff1176
- trying out changes in deployment Taskfile
Blusia May 6, 2025
99561ee
- update local files to work with new blumilk environment
Blusia May 13, 2025
9e4bfcb
- update .env.example
Blusia May 13, 2025
4af0800
- added docker rmi in dev workflow for DOCKER_APP_DATABASE_IMAGE_NAME
Blusia May 13, 2025
0705d31
- update readme.md and .env.example
Blusia May 14, 2025
ce50007
- update readme.md
Blusia May 14, 2025
9993a69
- update script in dev workflow
Blusia May 14, 2025
ff81109
- added dev environment to workflow
Blusia May 14, 2025
d6b661b
- corrections as suggested
Blusia May 15, 2025
d9c6777
- add storage link to post-deploy-actions.sh
Blusia May 15, 2025
0f61d40
- add build-args variable to dev workflow
Blusia May 15, 2025
f7b0f4a
- fixed link to presentations
EwelinaSkrzypacz May 16, 2025
2851cbe
- delete unnecessary files
EwelinaSkrzypacz May 16, 2025
d2c54f5
- update supervisord.conf for dev
Blusia May 16, 2025
14b5d2a
- add yt link and presentation link to mobile view
EwelinaSkrzypacz May 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_TIMEZONE=Europe/Warsaw
APP_URL=http://lmt.blumilk.localhost
APP_URL=http://lmt.blumilk.local.env
ENVIRONMENT=${APP_ENV}

APP_DOCKER_HOST_NAME=lmt.blumilk.local.env
MAILPIT_DOCKER_HOST_NAME=lmt-mailpit.blumilk.local.env
VITE_DEV_SERVER_DOCKER_HOST_NAME=lmt-vite-dev-server.blumilk.local.env

APP_LOCALE=pl
APP_FALLBACK_LOCALE=en
Expand Down
34 changes: 20 additions & 14 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
networks:
lmt-local:
driver: bridge
traefik-proxy-blumilk-local:
traefik-proxy-blumilk-local-environment:
external: true

volumes:
Expand All @@ -20,16 +20,24 @@ services:
- USER_ID=${DOCKER_HOST_USER_ID:-1000}
labels:
- "traefik.enable=true"
- "traefik.blumilk.environment=true"
- "traefik.blumilk.local.environment=true"
# HTTP
- "traefik.http.routers.lmt-http-router.rule=Host(`lmt.blumilk.localhost`)"
- "traefik.http.routers.lmt-http-router.rule=Host(`${APP_DOCKER_HOST_NAME}`)"
- "traefik.http.routers.lmt-http-router.entrypoints=web"
# HTTP to HTTPS redirect
# - "traefik.http.routers.lmt-http-router.middlewares=https-redirect@file"
- "traefik.http.routers.lmt-http-router.service=lmt-app"
# HTTPS
- "traefik.http.routers.lmt-https-router.rule=Host(`lmt.blumilk.localhost`)"
- "traefik.http.routers.lmt-https-router.rule=Host(`${APP_DOCKER_HOST_NAME}`)"
- "traefik.http.routers.lmt-https-router.entrypoints=websecure"
- "traefik.http.routers.lmt-https-router.tls=true"
- "traefik.http.routers.lmt-https-router.service=lmt-app"
# APP LOADBALANCER
- "traefik.http.services.lmt-app.loadbalancer.server.port=80"
# VITE DEV SERVER
- "traefik.http.routers.lmt-vite-dev-server-https-router.rule=Host(`${VITE_DEV_SERVER_DOCKER_HOST_NAME}`)"
- "traefik.http.routers.lmt-vite-dev-server-https-router.entrypoints=websecure"
- "traefik.http.routers.lmt-vite-dev-server-https-router.tls=true"
- "traefik.http.routers.lmt-vite-dev-server-https-router.service=lmt-vite-dev-server"
- "traefik.http.services.lmt-vite-dev-server.loadbalancer.server.port=5173"
working_dir: /application
volumes:
- ./environment/local/app/php.ini:/usr/local/etc/php/conf.d/zzz-overrides.ini:ro
Expand All @@ -40,7 +48,7 @@ services:
- ${DOCKER_APP_HOST_PORT:-8051}:80
networks:
- lmt-local
- traefik-proxy-blumilk-local
- traefik-proxy-blumilk-local-environment
restart: unless-stopped

database:
Expand Down Expand Up @@ -74,19 +82,17 @@ services:
- ${EXTERNAL_MAILPIT_SMTP_PORT:-8053}:1025
networks:
- lmt-local
- traefik-proxy-blumilk-local
- traefik-proxy-blumilk-local-environment
labels:
- "traefik.enable=true"
- "traefik.blumilk.environment=true"
- "traefik.blumilk.local.environment=true"
# HTTP
- "traefik.http.routers.lmt-mailpit-http-router.rule=Host(`lmt-mailpit.blumilk.localhost`)"
- "traefik.http.routers.lmt-mailpit-http-router.rule=Host(`${MAILPIT_DOCKER_HOST_NAME}`)"
- "traefik.http.routers.lmt-mailpit-http-router.entrypoints=web"
# HTTP to HTTPS redirect
# - "traefik.http.routers.lmt-mailpit-http-router.middlewares=https-redirect@file"
# HTTPS
- "traefik.http.routers.lmt-mailpit-https-router.rule=Host(`lmt-mailpit.blumilk.localhost`)"
- "traefik.http.routers.lmt-mailpit-https-router.rule=Host(`${MAILPIT_DOCKER_HOST_NAME}`)"
- "traefik.http.routers.lmt-mailpit-https-router.entrypoints=websecure"
- "traefik.http.routers.lmt-mailpit-https-router.tls=true"
# LOADBALANCER MAILHOG PORT
# LOADBALANCER MAILPIT PORT
- "traefik.http.services.lmt-mailpit.loadbalancer.server.port=8025"
restart: unless-stopped
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ if we use a Blumilk local traefik proxy.

| service | container name | default external port |
|---------------------|-----------------------------------------------|--------------------------------|
| app | [lmt-app-local](http://lmt.blumilk.localhost) | [8051](http://localhost:8051/) |
| app | [lmt-app-local](http://lmt.blumilk.local.env) | [8051](http://localhost:8051/) |
| mailpit (dashboard) | lmt-mailpit-local | [8052](http://localhost:8052/) |
| database | lmt-db-local | 8055 |

Expand Down
8 changes: 5 additions & 3 deletions vite.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { defineConfig, loadEnv } from 'vite'
import laravel from 'laravel-vite-plugin'
import tailwindcss from '@tailwindcss/vite'
import { networkInterfaces } from 'os'

export default ({ mode }) => {
process.env = { ...process.env, ...loadEnv(mode, process.cwd()) }
Expand All @@ -11,8 +10,11 @@ export default ({ mode }) => {
outDir: './public/build/',
},
server: {
host: Object.values(networkInterfaces()).flat().find(i => i.family === 'IPv4' && !i.internal).address,
port: process.env.VITE_PORT,
host: true,
port: 5173,
strictPort: true,
origin: 'https://' + process.env.VITE_DEV_SERVER_DOCKER_HOST_NAME,
cors: true, // Allow any origin
},
resolve: {
alias: {
Expand Down