From b2a442a7d8f5738ff11ab2298e43732d7fed9b50 Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Thu, 4 Apr 2024 23:12:32 +0200
Subject: [PATCH] Fix bundler not found problem

---
 .dockerignore                    |  2 ++
 Dockerfile                       |  1 -
 Gemfile.lock                     | 20 ++++++++++++++++----
 Procfile                         |  1 -
 Procfile.dev                     |  1 -
 app.json                         |  2 +-
 dev-docker-entrypoint.sh         |  7 +++++++
 dev-docker-sidekiq-entrypoint.sh | 14 ++++++++++++++
 docker-compose.yml               |  4 ++--
 9 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 dev-docker-sidekiq-entrypoint.sh

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..25ac0a6f
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+/log
+/tmp
diff --git a/Dockerfile b/Dockerfile
index 0b303083..b603b3d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,6 @@ RUN apk -U add --no-cache \
     && rm -rf /var/cache/apk/* \
     && mkdir -p $APP_PATH
 
-RUN gem update --system
 RUN gem install bundler --version "$BUNDLE_VERSION" \
     && rm -rf $GEM_HOME/cache/*
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2ef0adfe..4436757f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -160,8 +160,14 @@ GEM
     nio4r (2.7.1)
     nokogiri (1.16.3-aarch64-linux)
       racc (~> 1.4)
+    nokogiri (1.16.3-arm-linux)
+      racc (~> 1.4)
     nokogiri (1.16.3-arm64-darwin)
       racc (~> 1.4)
+    nokogiri (1.16.3-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.3-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.16.3-x86_64-linux)
       racc (~> 1.4)
     optimist (3.1.0)
@@ -308,10 +314,16 @@ GEM
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
+    tailwindcss-rails (2.3.0)
+      railties (>= 6.0.0)
     tailwindcss-rails (2.3.0-aarch64-linux)
       railties (>= 6.0.0)
+    tailwindcss-rails (2.3.0-arm-linux)
+      railties (>= 6.0.0)
     tailwindcss-rails (2.3.0-arm64-darwin)
       railties (>= 6.0.0)
+    tailwindcss-rails (2.3.0-x86_64-darwin)
+      railties (>= 6.0.0)
     tailwindcss-rails (2.3.0-x86_64-linux)
       railties (>= 6.0.0)
     thor (1.3.1)
@@ -333,10 +345,10 @@ GEM
 
 PLATFORMS
   aarch64-linux
-  aarch64-linux-musl
-  arm64-darwin-21
-  arm64-darwin-22
-  arm64-darwin-23
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
diff --git a/Procfile b/Procfile
index 2ec522c6..df6daf10 100644
--- a/Procfile
+++ b/Procfile
@@ -1,4 +1,3 @@
 web: bundle exec puma -C config/puma.rb
-worker: bundle exec sidekiq -C config/sidekiq.yml
 
 release: bundle exec rails db:migrate
diff --git a/Procfile.dev b/Procfile.dev
index 67106a1e..66c45582 100644
--- a/Procfile.dev
+++ b/Procfile.dev
@@ -1,3 +1,2 @@
 web: bin/rails server -p 3000 -b 0.0.0.0
 css: bin/rails tailwindcss:watch
-worker: bundle exec sidekiq -C config/sidekiq.yml
diff --git a/app.json b/app.json
index 268a27a4..e9afb8b2 100644
--- a/app.json
+++ b/app.json
@@ -4,7 +4,7 @@
       "quantity": 1
     },
     "worker": {
-      "quantity": 1
+      "quantity": 0
     }
   }
 }
diff --git a/dev-docker-entrypoint.sh b/dev-docker-entrypoint.sh
index 76b95cf4..e6bfe836 100644
--- a/dev-docker-entrypoint.sh
+++ b/dev-docker-entrypoint.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+unset BUNDLE_PATH
+unset BUNDLE_BIN
+
 set -e
 
 echo "Environment: $RAILS_ENV"
@@ -13,6 +16,10 @@ until nc -zv $DATABASE_HOST 5432; do
   sleep 1
 done
 
+# Install gems
+gem update --system
+gem install bundler --version '2.5.7'
+
 # Create the database
 echo "Creating database $DATABASE_NAME..."
 bundle exec rails db:create
diff --git a/dev-docker-sidekiq-entrypoint.sh b/dev-docker-sidekiq-entrypoint.sh
new file mode 100644
index 00000000..9fdecf4f
--- /dev/null
+++ b/dev-docker-sidekiq-entrypoint.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+echo "Environment: $RAILS_ENV"
+
+# Wait for the database to be ready
+until nc -zv $DATABASE_HOST 5432; do
+  echo "Waiting for PostgreSQL to be ready..."
+  sleep 1
+done
+
+# run passed commands
+bundle exec ${@}
diff --git a/docker-compose.yml b/docker-compose.yml
index 183864c3..f947ad55 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: password
   dawarich_app:
-    image: freikin/dawarich:0.1.4
+    image: freikin/dawarich:0.1.4.1
     container_name: dawarich_app
     volumes:
       - gem_cache:/usr/local/bundle/gems
@@ -45,7 +45,7 @@ services:
       - dawarich_db
       - dawarich_redis
   dawarich_sidekiq:
-    image: freikin/dawarich:0.1.4
+    image: freikin/dawarich:0.1.4.1
     container_name: dawarich_sidekiq
     volumes:
       - gem_cache:/usr/local/bundle/gems