Merge pull request #1 from alexmsenger/46-add-arm64-support

podify-org#46 adds support for arm64
blakek · Oct 27, 2023 · 4ac5bb3 · 4ac5bb3
2 parents 231cc17 + c6c86db
commit 4ac5bb3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,24 +1,22 @@
 FROM docker.io/library/ruby:3.2.1
 
-RUN apt-get update -qq && apt-get install -y \
+# Note: This is deprecated
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - 
+
+RUN apt-get update -qq && apt-get install -y --no-install-recommends \
     ffmpeg \
     nodejs \
-    npm \
     postgresql-client \
-    python2.7 \
     python3 \
-    python3-pip
-
-# Set python2.7 for old node-gyp
-ENV PYTHON=/usr/bin/python2.7
-
-RUN npm install -g yarn
+    python3-pip && \
+    rm -rf /var/apt/*
 
 RUN mkdir /app
 WORKDIR /app
 
 COPY Gemfile /app/Gemfile
 COPY Gemfile.lock /app/Gemfile.lock
+
 RUN bundle config set clean true && \
     bundle config set deployment true && \
     bundle config set no-cache true && \
@@ -27,7 +25,8 @@ RUN bundle config set clean true && \
 
 COPY package.json /app/package.json
 COPY yarn.lock /app/yarn.lock
-RUN yarn install --production
+RUN npm install -g --python=python3 npm node-gyp yarn && \
+    yarn install --production
 
 COPY . /app
 

diff --git a/Gemfile b/Gemfile
@@ -57,6 +57,8 @@ gem 'mimemagic', "~> 0.3"
 
 gem 'amazing_print', "~> 1.2"
 
+gem 'rss'
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', "~> 11.1", platforms: [:mri, :mingw, :x64_mingw]

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -310,6 +310,7 @@ GEM
     responders (3.1.0)
       actionpack (>= 5.2)
       railties (>= 5.2)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -331,6 +332,8 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.12.0)
+    rss (0.3.0)
+      rexml
     ruby2_keywords (0.0.5)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
@@ -448,6 +451,7 @@ DEPENDENCIES
   rails (~> 7.0)
   rspec (~> 3.9)
   rspec-rails (~> 4.0)
+  rss
   sass-rails (~> 6.0)
   sentry-raven (~> 3.0)
   sequel-devise (~> 0.0)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.1",
     "@fortawesome/vue-fontawesome": "^0.1.10",
     "@rails/ujs": "^6.0.3",
-    "@rails/webpacker": "4.2.2",
+    "@rails/webpacker": "5.4.4",
     "actioncable-vue": "^2.3.2",
     "apollo-cache-inmemory": "^1.6.6",
     "apollo-client": "^2.6.10",