diff --git a/Dockerfile b/Dockerfile index 0944725..eaecdfa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,10 +28,4 @@ EXPOSE 3000 RUN SECRET_KEY_BASE=dummy_key RAILS_ENV=production bundle exec rake assets:precompile -# Copy both entrypoint scripts and make them executable -COPY entrypoint.sh /usr/bin/ -COPY sidekiq-entrypoint.sh /usr/bin/ -RUN chmod +x /usr/bin/entrypoint.sh -RUN chmod +x /usr/bin/sidekiq-entrypoint.sh - CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0", "-p", "3000"] \ No newline at end of file diff --git a/VERSION b/VERSION index dc3ea5e..b2627f2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.5-alpha \ No newline at end of file +1.0.6-alpha \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index a87cea3..8ea9003 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ services: web: build: . - command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails server -b 0.0.0.0 -p 3000" entrypoint: ["./entrypoint.sh"] volumes: - .:/app diff --git a/entrypoint.sh b/entrypoint.sh index 28f0514..306530a 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,14 +1,17 @@ #!/bin/bash set -e - +echo "Starting entrypoint.sh" export REDIS_URL=redis://redis:6379/1 export SECRET_KEY_BASE=$(bin/rails secret) rm -f /app/tmp/pids/server.pid +echo "Running bundle exec rake assets:precompile" bundle exec rake assets:precompile +echo "Running bundle exec rails db:migrate" bundle exec rails db:migrate +echo "Executing final command: $@" exec "$@"