Skip to content

Commit

Permalink
Fix deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
hulloitskai committed Jan 29, 2025
1 parent 29e3d04 commit fbcfea2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
deploy:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
runs-on: ubuntu-latest
timeout-minutes: 10
timeout-minutes: 15
env:
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
steps:
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -126,16 +126,16 @@ COPY Gemfile Gemfile.lock ./
ENV BUNDLE_WITHOUT="development test"
RUN --mount=type=cache,target=/var/cache,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
BUILD_DEPS="build-essential libreadline-dev libyaml-dev libjemalloc-dev libpq-dev" \
BUILD_DEPS="build-essential libreadline-dev libyaml-dev libjemalloc-dev libpq-dev git" \
RUNTIME_DEPS="libpq5" set -eux && \
apt-get update -yq && \
echo $BUILD_DEPS $RUNTIME_DEPS | xargs apt-get install -yq --no-install-recommends; \
BUNDLE_IGNORE_MESSAGES=1 bundle install && \
echo $BUILD_DEPS | xargs apt-get purge -yq --auto-remove -o APT::AutoRemove::RecommendsImportant=false && \
rm -r /var/log/* && \
rm -r /root/.bundle/ "${BUNDLE_PATH}"/cache/*.gem "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git && \
find "${BUNDLE_PATH}"/gems/ -name "*.c" -delete && \
find "${BUNDLE_PATH}"/gems/ -name "*.o" -delete && \
rm -r /root/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git && \
find "${BUNDLE_PATH}"/ruby/*/bundler/gems/ -name "*.c" -delete && \
find "${BUNDLE_PATH}"/ruby/*/bundler/gems/ -name "*.o" -delete && \
bundle exec bootsnap precompile --gemfile

# Install NodeJS dependencies
Expand Down
2 changes: 1 addition & 1 deletion bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ FileUtils.chdir APP_ROOT do
system! "bin/rails log:clear tmp:clear"
puts "Files removed"

if ARGV.exclude("--skip-server")
if !ARGV.include?("--skip-server")
puts "\n=> Starting development server"
STDOUT.flush # flush the output before exec(2) so that it displays
exec "bin/dev"
Expand Down

0 comments on commit fbcfea2

Please sign in to comment.