Merge pull request #41 from blocknotes/improve-dev-setup

Improve dev setup

Author: blocknotes

Gemfile

@@ -20,6 +20,10 @@ rails_ver = ENV.fetch('RAILS_VERSION', '')
 rails = eval_version('rails', rails_ver)
 gem(*rails)
 
+ransack_ver = ENV.fetch('RANSACK_VERSION', '')
+ransack = eval_version('ransack', ransack_ver)
+gem(*ransack)
+
 administrate_ver = ENV.fetch('ADMINISTRATE_VERSION', '')
 administrate = eval_version('administrate', administrate_ver)
 gem(*administrate)

Makefile

@@ -2,13 +2,13 @@ include extra/.env
 
 help:
 	@echo -e "${COMPOSE_PROJECT_NAME} - Main project commands:\n\
-		make up   	# starts the dev services (optional env vars: RUBY / RAILS / ADMINISTRATE)\n\
+		make up   	# starts the dev services (optional env vars: RUBY / RAILS / RANSACK / ADMINISTRATE)\n\
 		make specs	# run the tests (after up)\n\
 		make lint 	# run the linters (after up)\n\
 		make server	# run the server (after up)\n\
 		make shell	# open a shell (after up)\n\
 		make down 	# cleanup (after up)\n\
-	Example: RUBY=3.2 RAILS=7.1 ADMINISTRATE=0.18.0 make up"
+	Example: RUBY=3.2 RAILS=7.1 RANSACK=4.2.0 ADMINISTRATE=0.18.0 make up"
 
 # System commands
 
@@ -44,4 +44,4 @@ server: seed
 	@docker compose -f extra/docker-compose.yml exec app bin/rails server -b 0.0.0.0 -p ${SERVER_PORT}
 
 specs:
-	@docker compose -f extra/docker-compose.yml exec app bin/rspec --fail-fast
+	@docker compose -f extra/docker-compose.yml exec app bin/rspec

extra/Dockerfile

@@ -16,16 +16,19 @@ ARG UID
 RUN useradd -u $UID --shell /bin/bash app 
 
 RUN mkdir -p /home/app && chown -R app:app /home/app
+RUN chown -R app:app /usr/local/bundle
+RUN ln -s /app/extra/.bashrc /home/app/.bashrc
 
 ARG RAILS_VERSION
 ENV RAILS_VERSION=$RAILS_VERSION
 
+ARG RANSACK_VERSION
+ENV RANSACK_VERSION=$RANSACK_VERSION
+
 ARG ADMINISTRATE_VERSION
 ENV ADMINISTRATE_VERSION=$ADMINISTRATE_VERSION
 
+USER $UID
 WORKDIR /app
 COPY . /app
 RUN bundle install
-RUN chown -R app:app /usr/local/bundle
-
-RUN ln -s /app/extra/.bashrc /home/app/.bashrc

extra/development.md

@@ -7,15 +7,15 @@ There are 2 ways to interact with this project:
 1) Using Docker:
 
 ```sh
-make up         # starts the dev services (optional env vars: RUBY / RAILS / ADMINISTRATE)
+make up         # starts the dev services (optional env vars: RUBY / RAILS / RANSACK / ADMINISTRATE)
 make specs      # run the tests (after up)
 make lint       # run the linters (after up)
 make server     # run the server (after up)
 make shell      # open a shell (after up)
 make down       # cleanup (after up)
 
 # Example using specific versions:
-RUBY=3.2 RAILS=7.1 ADMINISTRATE=0.18.0 make up
+RUBY=3.2 RAILS=7.1 RANSACK=4.2.0 ADMINISTRATE=0.18.0 make up
 ```
 
 2) With a local setup:

extra/docker-compose.yml

@@ -7,6 +7,7 @@ services:
         BUNDLER_VERSION: ${BUNDLER_VERSION}
         RUBY_IMAGE: ruby:${RUBY:-3.4}-slim
         RAILS_VERSION: ${RAILS:-}
+        RANSACK_VERSION: ${RANSACK:-}
         ADMINISTRATE_VERSION: ${ADMINISTRATE:-}
         UID: ${UID}
     user: ${UID}:${GID}