Merge remote-tracking branch 'origin/master' into prod
This commit is contained in:
commit
ce0a5d1b2c
|
@ -2,7 +2,6 @@
|
|||
FROM ruby:3.2
|
||||
WORKDIR /app
|
||||
COPY Gemfile /app/Gemfile
|
||||
COPY Gemfile.lock /app/Gemfile.lock
|
||||
|
||||
# Add a script to be executed every time the container starts.
|
||||
COPY entrypoint.sh /usr/bin/
|
||||
|
|
|
@ -8,8 +8,6 @@ services:
|
|||
restart: always
|
||||
volumes:
|
||||
- .:/app
|
||||
ports:
|
||||
- "4000:4000"
|
||||
container_name: jekyll
|
||||
networks:
|
||||
- snowboard
|
||||
|
|
|
@ -6,7 +6,7 @@ rm -f /app/tmp/pids/server.pid
|
|||
gem update --system
|
||||
bundle install
|
||||
git config --global --add safe.directory /app
|
||||
bundle exec jekyll serve --livereload --host 0.0.0.0 -o http://localhost:4000 --port 4000
|
||||
bundle exec jekyll serve --host 0.0.0.0 -o https://www.cscherr.de:4000 --port 4000
|
||||
|
||||
# Then exec the container's main process (what's set as CMD in the Dockerfile).
|
||||
exec "$@"
|
||||
|
|
Loading…
Reference in New Issue