From 2a4faa79338c04cb8f13b2bb31f6a298b4fc0125 Mon Sep 17 00:00:00 2001 From: takatama Date: Sat, 15 Jul 2023 00:49:13 +0900 Subject: [PATCH] Remove entrykit for M1 Mac --- Dockerfile | 12 ++---------- entrypoint.rb | 7 +++++++ 2 files changed, 9 insertions(+), 10 deletions(-) create mode 100755 entrypoint.rb diff --git a/Dockerfile b/Dockerfile index efb57659d..9128c894a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6.5 +FROM ruby:3.0.6 ENV LANG C.UTF-8 @@ -11,12 +11,6 @@ RUN apt-get update -qq \ ENV ENTRYKIT_VERSION 0.4.0 -RUN wget https://github.com/progrium/entrykit/releases/download/v${ENTRYKIT_VERSION}/entrykit_${ENTRYKIT_VERSION}_Linux_x86_64.tgz \ - && tar -xvzf entrykit_${ENTRYKIT_VERSION}_Linux_x86_64.tgz \ - && rm entrykit_${ENTRYKIT_VERSION}_Linux_x86_64.tgz \ - && mv entrykit /bin/entrykit \ - && chmod +x /bin/entrykit \ - && entrykit --symlink RUN mkdir /app @@ -24,6 +18,4 @@ WORKDIR /app RUN bundle config build.nokogiri --use-system-libraries -ENTRYPOINT [ \ - "prehook", "ruby -v", "--", \ - "prehook", "bundle install -j3 --quiet", "--"] +ENTRYPOINT [ "./entrypoint.rb" ] \ No newline at end of file diff --git a/entrypoint.rb b/entrypoint.rb new file mode 100755 index 000000000..3993395da --- /dev/null +++ b/entrypoint.rb @@ -0,0 +1,7 @@ +#! /usr/bin/env ruby + +system("ruby -v") +system("gem install bundler:2.4.7") +system("bundle install -j3 --quiet") + +exec *ARGV \ No newline at end of file