roll all functionality into 1 container

Author: Test

Dockerfile

@@ -3,12 +3,12 @@ FROM ruby:3.2.2
 
 # Install dependencies
 RUN apt-get update -qq
-RUN apt-get install -y nodejs postgresql-client libsqlite3-dev build-essential 
-RUN apt-get install -y default-libmysqlclient-dev libmariadb-dev-compat
+RUN apt-get install -y nodejs postgresql-client libsqlite3-dev build-essential
+RUN apt-get install -y default-libmysqlclient-dev libmariadb-dev-compat redis-server
 
 # Set environment variables
 ENV RAILS_ENV=production
-ENV REDIS_URL=redis://redis:6379/1
+ENV REDIS_URL=redis://localhost:6380/1
 
 # Set the working directory in the container
 WORKDIR /app
@@ -28,15 +28,13 @@ COPY sidekiq-entrypoint.sh ./sidekiq-entrypoint.sh
 COPY rails-entrypoint.sh ./rails-entrypoint.sh
 
 # Make sure the entrypoint scripts are executable
-RUN chmod +x entrypoint.sh sidekiq-entrypoint.sh
+RUN chmod +x entrypoint.sh sidekiq-entrypoint.sh rails-entrypoint.sh
 
 # Precompile assets for production
 RUN SECRET_KEY_BASE=dummy_key RAILS_ENV=production bundle exec rake assets:precompile
 
-# Expose the application port
+# Expose the application port and custom Redis port
 EXPOSE 3000
+EXPOSE 6380
 
 ENTRYPOINT ["./entrypoint.sh"]
-
-# Default command to run the Rails server
-CMD bundle exec rails server -b 0.0.0.0 -p 3000

README.md

@@ -135,7 +135,7 @@ Before you start, ensure you have the following installed:
 4. Start the application with the `SECRET_KEY_BASE` environment variable set:
 
     ```bash
-    SECRET_KEY_BASE=$(bundle exec rake secret) foreman start
+    foreman start
     ```
 
 ## Configuration

VERSION

@@ -1 +1 @@
-1.0.17-alpha
+1.0.18-alpha

config/credentials.yml.enc

@@ -0,0 +1 @@
+XPipw3icn3ImGvT+ngdEv55GUi/qsdvDKEFz2ZQsi81kBRowLs54twbRrH1CG6k7NxOr5UcY4yQ/5G/QR1ks35cVJsbWGQHpM04ZsXw8M5RRgl/e3LcCl1qXlVQicm3pEbtlSef0PJxNpxxbUjoDuUv6KjScrLcHZQGeDQabcFHqjsl0YthzeLDA3ojcXTWHLNYeRV8TBvaI2MKgPV2By6jXo5jGQW1kxpTBXzjIvKhDvHyNAzzazkPMBpbFEmF9SGrjvwyL0YcJh7sbRCjguk+ygG7SetazVYyE7Y+0hZ0OAxx0zXiAiZZ+aRXInWrZac9TF7Sq4HI5cN0H/2OPcB86XLt1ochMw9h93fmXlvyRrlbYaCv2P1sXCoX4liHNJwCovkl/Mg+Bgc+7GY3EgfXcwlut--nCVgf0LbKPzPE5Xf--O19Yd363azqX1CIkTmukhw==

docker-compose.yml

@@ -1,42 +1,15 @@
 services:
-  web:
+  app:
     build: .
-    entrypoint: ["./rails-entrypoint.sh"]
     volumes:
-      - .:/app
       - ./storage:/app/storage
     ports:
       - "3000:3000"
     environment:
       RAILS_ENV: production
-      REDIS_URL: redis://redis:6379/1
+      REDIS_URL: redis://localhost:6380/1
+    entrypoint: ["./entrypoint.sh"]
     command: ["bundle", "exec", "rails", "server", "-b", "0.0.0.0", "-p", "3000"]
-    depends_on:
-      - redis
-    networks:
-      - thinknet
-
-  worker:
-    build: .
-    entrypoint: ["./sidekiq-entrypoint.sh"]
-    command: ["bundle", "exec", "sidekiq"]
-    volumes:
-      - .:/app
-      - ./storage:/app/storage
-    environment:
-      RAILS_ENV: production
-      REDIS_URL: redis://redis:6379/1
-    depends_on:
-      - redis
-    networks:
-      - thinknet
-
-  redis:
-    container_name: redis
-    image: redis:latest
-    command: ["redis-server", "--bind", "redis", "--port", "6379"]
-    ports:
-      - "6379:6379"
     networks:
       - thinknet
 

entrypoint.sh

@@ -1,10 +1,16 @@
 #!/bin/bash
 
-# Call the first entrypoint script
-./rails-entrypoint.sh
+# Start Redis server on a different port in the background
+redis-server --port 6380 --daemonize yes
 
-# Call the second entrypoint script
-./sidekiq-entrypoint.sh
+if [ -z "$SECRET_KEY_BASE" ]; then
+  export SECRET_KEY_BASE=$(bin/rails secret)
+fi
 
-# Finally, execute the command passed to the Docker container
+# Start Sidekiq worker in the background
+./sidekiq-entrypoint.sh &
+bundle exec sidekiq &
+
+
+# Exit with the status of the last process to exit
 exec "$@"