Removed cron container from debug build
parent
2c8f1ac601
commit
a0e55e4830
|
@ -0,0 +1,14 @@
|
||||||
|
version: '2.4'
|
||||||
|
|
||||||
|
services:
|
||||||
|
cron:
|
||||||
|
image: 'chewingbever/fej:latest'
|
||||||
|
restart: 'always'
|
||||||
|
|
||||||
|
entrypoint: 'crond -f'
|
||||||
|
user: 'root'
|
||||||
|
healthcheck:
|
||||||
|
disable: true
|
||||||
|
|
||||||
|
environment:
|
||||||
|
- 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
|
|
@ -12,18 +12,6 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
|
- 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
|
||||||
|
|
||||||
cron:
|
|
||||||
image: 'chewingbever/fej:latest'
|
|
||||||
restart: 'always'
|
|
||||||
|
|
||||||
entrypoint: 'crond -f'
|
|
||||||
user: 'root'
|
|
||||||
healthcheck:
|
|
||||||
disable: true
|
|
||||||
|
|
||||||
environment:
|
|
||||||
- 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
|
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: 'postgres:13-alpine'
|
image: 'postgres:13-alpine'
|
||||||
restart: 'always'
|
restart: 'always'
|
||||||
|
@ -42,6 +30,5 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- 'db-data:/var/lib/postgresql/data'
|
- 'db-data:/var/lib/postgresql/data'
|
||||||
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
db-data:
|
db-data:
|
||||||
|
|
3
fejctl
3
fejctl
|
@ -31,6 +31,7 @@ function dc() {
|
||||||
if [[ "$release" -eq 1 ]]; then
|
if [[ "$release" -eq 1 ]]; then
|
||||||
DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose \
|
DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose \
|
||||||
--file docker/docker-compose.yml \
|
--file docker/docker-compose.yml \
|
||||||
|
--file docker/docker-compose.override.yml \
|
||||||
--project-name fej \
|
--project-name fej \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
|
@ -112,7 +113,7 @@ function main() {
|
||||||
l | logs ) dc -- logs -f app ;;
|
l | logs ) dc -- logs -f app ;;
|
||||||
lint ) cargo fmt -- --check ;;
|
lint ) cargo fmt -- --check ;;
|
||||||
p | push | publish ) publish ;;
|
p | push | publish ) publish ;;
|
||||||
t | test ) dc test --no-fail-fast ;;
|
t | test ) dcr -- test --no-fail-fast && dc -- logs -f app ;;
|
||||||
* ) >&2 echo "Invalid command."; exit 1 ;;
|
* ) >&2 echo "Invalid command."; exit 1 ;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue