build: Minor updates to the Docker dev setup

Author: blocknotes

Makefile

@@ -16,6 +16,9 @@ shell:
 specs:
 	@docker compose -f extra/docker-compose.yml exec app_with_${DB} bin/rspec --fail-fast
 
+console:
+	@docker compose -f extra/docker-compose.yml exec app_with_${DB} bin/rails c
+
 server:
 	@docker compose -f extra/docker-compose.yml exec app_with_${DB} bin/rails s -b 0.0.0.0 -p ${SERVER_PORT}
 

extra/.bashrc

@@ -0,0 +1,3 @@
+alias ls='ls --color'
+alias ll='ls -l'
+alias la='ls -la'

extra/.env

@@ -1,6 +1,7 @@
 COMPOSE_PROJECT_NAME=active_storage_db
 
+BUNDLER_VERSION=2.5.23
+SERVER_PORT=4000
+
 UID=1000
 GID=1000
-
-SERVER_PORT=4000

extra/Dockerfile

@@ -6,23 +6,24 @@ ENV DEVEL=1
 ENV LANG=C.UTF-8
 
 RUN apt-get update -qq
-RUN apt-get install -yqq --no-install-recommends build-essential nano netcat-traditional pkg-config
+RUN apt-get install -yqq --no-install-recommends build-essential less nano netcat-traditional pkg-config
 RUN apt-get install -yqq --no-install-recommends freetds-dev libmariadb-dev libpq-dev libvips42 libyaml-dev sqlite3
 
-RUN gem install bundler -v 2.5.23
+ARG BUNDLER_VERSION
+RUN gem install bundler -v ${BUNDLER_VERSION}
 RUN echo 'gem: --no-document' > /etc/gemrc
 
 ARG UID
 RUN useradd -u $UID --shell /bin/bash app 
 
-RUN mkdir -p /home/app
-RUN chown -R app:app /home/app
-RUN chown -R app /usr/local/bundle 
+RUN mkdir -p /home/app && chown -R app:app /home/app
 
 ARG RAILS_VERSION
 ENV RAILS_VERSION=$RAILS_VERSION
 
 WORKDIR /app
 COPY . /app
 RUN bundle install
-RUN chown -R app:app /app/spec/dummy/db
+RUN chown -R app:app /app/spec/dummy/db /usr/local/bundle
+
+RUN ln -s /app/extra/.bashrc /home/app/.bashrc

extra/docker-compose.yml

@@ -4,9 +4,9 @@ services:
       context: ..
       dockerfile: extra/Dockerfile
       args:
-        # Debian-based Ruby image:
-        RUBY_IMAGE: ruby:${RUBY:-3.2}-slim
+        RUBY_IMAGE: ruby:${RUBY:-3.4}-slim
         RAILS_VERSION: ${RAILS:-}
+        BUNDLER_VERSION: ${BUNDLER_VERSION}
         UID: ${UID}
     user: ${UID}:${GID}
     ports: