Merge pull request #2421 from TracksApp/docker-fix

Run migration before starting Docker server; update README a bit
This commit is contained in:
Jyri-Petteri Paloposki 2020-07-17 16:09:17 +03:00 committed by GitHub
commit db496084f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 16 deletions

View file

@ -17,10 +17,9 @@ COPY . /app/
COPY config/database.docker.yml /app/config/database.yml
COPY config/site.docker.yml /app/config/site.yml
#COPY docker-entrypoint.sh /
#ENTRYPOINT ["/docker-entrypoint.sh"]
COPY docker-startserver.sh /
EXPOSE 3000
#CMD ["rails", "server", "-e", "production", "-b", "0.0.0.0"]
CMD ["rails", "server", "-b", "0.0.0.0"]
CMD ["./docker-startserver.sh"]

View file

@ -9,25 +9,15 @@
* IRC channel: #tracks on Freenode
* Gitter: https://gitter.im/TracksApp/tracks
* Original developer: bsag (http://www.rousette.org.uk/)
* Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP) (sponsored by Ardcoras oy, https://www.ardcoras.fi/)
* Contributors: https://github.com/TracksApp/tracks/wiki/Contributors
* License: See COPYING
[![Build Status](https://github.com/TracksApp/tracks/workflows/Continuous%20Integration/badge.svg)](https://github.com/TracksApp/tracks/actions)
[![Code Climate](https://codeclimate.com/github/TracksApp/tracks/badges/gpa.svg)](https://codeclimate.com/github/TracksApp/tracks)
Full instructions for both new installations and upgrades from older installations of Tracks
can be found within the /doc directory.
The instructions might appear long and intimidatingly complex, but that is
mostly because of the number of different platforms supported, and the
different configurations which can be used (e.g. running Tracks on your local
computer or on a remote server). If you choose the appropriate section for your
situation (installation vs. upgrade), and use the easiest (recommended) method,
you should find the instructions easy to follow. If you encounter problems, try
searching the wiki or mailing list (URLs above), and ask a question if
you cannot find a solution to your problem.
The wiki has a lot of user contributed installation HOWTOs for various webhosts, specific OS's and more.
Full instructions for both new installations and upgrades from older installations
of Tracks can be found in the [wiki](https://github.com/TracksApp/tracks/wiki/Installation).
If you are thinking about contributing towards the development of Tracks,
please read /CONTRIBUTING.md for general information. Also you can find

4
docker-startserver.sh Executable file
View file

@ -0,0 +1,4 @@
#!/bin/sh
rails db:migrate
rails server -b 0.0.0.0