diff --git a/.dockerignore b/.dockerignore index 0e92e2e00..f18bf81b1 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,7 +8,5 @@ Dockerfile /photoprism docker-compose* /coverage.* -.gitignore .dockerignore -.idea -.travis.yml \ No newline at end of file +.idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b5f34db2c..7a44bb541 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,8 @@ before_script: - docker-compose -f docker-compose.travis.yml up -d --build script: - - if [ "$TRAVIS_BRANCH" == "develop" ]; then docker-compose -f docker-compose.travis.yml exec photoprism make migrate test-codecov; fi - - if [ "$TRAVIS_BRANCH" != "develop" ]; then docker-compose -f docker-compose.travis.yml exec photoprism make migrate test; fi + - if [ "$TRAVIS_BRANCH" == "develop" ]; then docker-compose -f docker-compose.travis.yml exec photoprism make all migrate test-codecov; fi + - if [ "$TRAVIS_BRANCH" != "develop" ]; then docker-compose -f docker-compose.travis.yml exec photoprism make all migrate test; fi after_script: - docker-compose -f docker-compose.travis.yml down diff --git a/Dockerfile b/Dockerfile index 9dacffcfe..90900298d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,4 @@ FROM photoprism/development:20181109 # Set up project directory WORKDIR "/go/src/github.com/photoprism/photoprism" -COPY . . - -# Build PhotoPrism -RUN make all install - -# Start PhotoPrism server -CMD photoprism start \ No newline at end of file +COPY . . \ No newline at end of file