Fix for .travis.yml and docker-compose.travis.yml

This commit is contained in:
Michael Mayer 2018-09-17 12:33:48 +02:00
parent bc4417b6b0
commit 5ba5addc51
2 changed files with 3 additions and 11 deletions

View file

@ -14,6 +14,7 @@ after_script:
deploy: deploy:
provider: script provider: script
script: scripts/docker_push.sh script: make docker-push
skip_cleanup: true
on: on:
branch: master branch: master

View file

@ -5,21 +5,12 @@ services:
build: . build: .
image: photoprism/photoprism image: photoprism/photoprism
command: tail -f /dev/null command: tail -f /dev/null
volumes:
- .:/go/src/github.com/photoprism/photoprism
- ./configs/photoprism.dev.yml:/etc/photoprism/photoprism.yml
database: database:
image: mysql:latest image: mysql:latest
command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=1024 command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=1024
volumes:
- database-data:/var/lib/mysql
environment: environment:
MYSQL_ROOT_PASSWORD: photoprism MYSQL_ROOT_PASSWORD: photoprism
MYSQL_USER: photoprism MYSQL_USER: photoprism
MYSQL_PASSWORD: photoprism MYSQL_PASSWORD: photoprism
MYSQL_DATABASE: photoprism MYSQL_DATABASE: photoprism
volumes:
database-data:
driver: local