From 336d7532c74800c58676b3ccb6d918ccb1f138f7 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Tue, 5 Jan 2021 13:53:30 -0600 Subject: [PATCH] Add a docker entrypoint so we don't have pid files lying around --- Dockerfile | 5 ++--- Gemfile.lock | 1 + docker-entrypoint.sh | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100755 docker-entrypoint.sh diff --git a/Dockerfile b/Dockerfile index 1a204173..3fcc2bb6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,6 @@ COPY Gemfile Gemfile.lock ./ RUN bundle install --without production -COPY . . +COPY . ./ -EXPOSE 3000 -CMD ["rails", "server", "-b", "0.0.0.0"] +ENTRYPOINT ["./docker-entrypoint.sh"] diff --git a/Gemfile.lock b/Gemfile.lock index f9e67838..ceabc953 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -469,6 +469,7 @@ GEM PLATFORMS ruby + x86_64-darwin-19 x86_64-linux DEPENDENCIES diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100755 index 00000000..51863829 --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ -f tmp/pids/server.pid ]; then + rm tmp/pids/server.pid +fi + +bundle exec rails s -b 0.0.0.0