upgrade docker images.
This commit is contained in:
parent
a54753db09
commit
952206b393
|
@ -56,7 +56,6 @@ To start the application using docker compose locally:
|
||||||
| `DB_MIN_CONNECTIONS` | Db Minimum Connections | 5
|
| `DB_MIN_CONNECTIONS` | Db Minimum Connections | 5
|
||||||
| `DB_SOCKET_TIMEOUT` | Db socket timeout | 5
|
| `DB_SOCKET_TIMEOUT` | Db socket timeout | 5
|
||||||
| `DB_WAIT_QUEUE_TIMEOUT` | Db Wait queue timeout | 5
|
| `DB_WAIT_QUEUE_TIMEOUT` | Db Wait queue timeout | 5
|
||||||
| `FONTAWESOME_NPM_AUTH_TOKEN` | FontAwesome Auth token | -
|
|
||||||
| `LOG_LEVEL` | Log level | warn
|
| `LOG_LEVEL` | Log level | warn
|
||||||
| `REDIS_URL` | Redis Url | redis://localhost:6379/0
|
| `REDIS_URL` | Redis Url | redis://localhost:6379/0
|
||||||
| `SMTP_HOST` | Smpt address | `localhost`
|
| `SMTP_HOST` | Smpt address | `localhost`
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
version: "2.1"
|
---
|
||||||
|
version: "2.1"
|
||||||
services:
|
services:
|
||||||
mailcatcher:
|
mailcatcher:
|
||||||
image: jeanberu/mailcatcher:0.6.5
|
image: jeanberu/mailcatcher:0.6.5
|
||||||
|
@ -7,22 +8,22 @@ services:
|
||||||
- "1025:1025"
|
- "1025:1025"
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
image: "postgres:11.5-alpine"
|
image: "postgres:13-alpine"
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: "user"
|
POSTGRES_USER: "user"
|
||||||
POSTGRES_PASSWORD: "password"
|
POSTGRES_PASSWORD: "password"
|
||||||
ports:
|
ports:
|
||||||
- "5432:5432"
|
- "5432:5432"
|
||||||
volumes:
|
volumes:
|
||||||
- /usr/local/var/postgres/data:/var/lib/postgresql/data
|
- ./tmp/postgres/data:/var/lib/postgresql/data
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:5.0-alpine
|
image: redis:6.0-alpine
|
||||||
command: redis-server
|
command: redis-server
|
||||||
expose:
|
expose:
|
||||||
- "6379"
|
- "6379"
|
||||||
volumes:
|
volumes:
|
||||||
- /usr/local/var/redis/data:/var/lib/redis/data
|
- ./tmp/redis/data:/var/lib/redis/data
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: "redis-cli ping"
|
test: "redis-cli ping"
|
||||||
interval: 5s
|
interval: 5s
|
||||||
|
@ -38,20 +39,20 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- .:/app
|
- .:/app
|
||||||
env_file:
|
env_file:
|
||||||
- '.env.docker'
|
- ".env.docker"
|
||||||
|
|
||||||
webpacker:
|
webpacker:
|
||||||
build: .
|
build: .
|
||||||
environment:
|
environment:
|
||||||
- WEBPACKER_DEV_SERVER_HOST=0.0.0.0
|
- WEBPACKER_DEV_SERVER_HOST=0.0.0.0
|
||||||
env_file:
|
env_file:
|
||||||
- '.env.docker'
|
- ".env.docker"
|
||||||
command: ./bin/webpack-dev-server
|
command: ./bin/webpack-dev-server
|
||||||
volumes:
|
volumes:
|
||||||
- .:/app
|
- .:/app
|
||||||
ports:
|
ports:
|
||||||
- '3035:3035'
|
- "3035:3035"
|
||||||
- '8080:8080'
|
- "8080:8080"
|
||||||
|
|
||||||
app:
|
app:
|
||||||
build: .
|
build: .
|
||||||
|
@ -68,4 +69,4 @@ services:
|
||||||
stdin_open: true
|
stdin_open: true
|
||||||
tty: true
|
tty: true
|
||||||
env_file:
|
env_file:
|
||||||
- '.env.docker'
|
- ".env.docker"
|
||||||
|
|
Loading…
Reference in New Issue