build: Update Docker dev setup (2)

blocknotes · blocknotes · commit 2ec7b5c86a2e · 2025-04-01T00:02:35.000+02:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,15 @@
+/Makefile
+/LICENSE.txt
+/Gemfile.lock
+/extra/init.sh
+
+/app
+/bin
+/coverage
+/gemfiles
+/spec/dummy/db/*.sqlite3
+/spec/dummy/log
+/spec/dummy/tmp
+/spec/dummy/**/*_spec.rb
+
+/**/*.md
diff --git a/.env b/.env
diff --git a/.github/workflows/specs_rails70.yml b/.github/workflows/specs_rails70.yml
@@ -29,6 +29,9 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
+      - name: Database setup
+        run: bin/rails db:reset db:test:prepare
+
       - name: Run tests
         run: bundle exec rspec --profile
 
diff --git a/.github/workflows/specs_rails71.yml b/.github/workflows/specs_rails71.yml
@@ -29,6 +29,9 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
+      - name: Database setup
+        run: bin/rails db:reset db:test:prepare
+
       - name: Run tests
         run: bundle exec rspec --profile
 
diff --git a/.github/workflows/specs_rails72.yml b/.github/workflows/specs_rails72.yml
@@ -29,6 +29,9 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
+      - name: Database setup
+        run: bin/rails db:reset db:test:prepare
+
       - name: Run tests
         run: bundle exec rspec --profile
 
diff --git a/.github/workflows/specs_rails80.yml b/.github/workflows/specs_rails80.yml
@@ -29,6 +29,9 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
+      - name: Database setup
+        run: bin/rails db:reset db:test:prepare
+
       - name: Run tests
         run: bundle exec rspec --profile
 
diff --git a/Gemfile b/Gemfile
@@ -3,10 +3,21 @@
 source 'https://rubygems.org'
 
 if ENV['DEVEL'] == '1'
-  rails_ver = ENV.fetch('RAILS_VERSION')
-  gem 'rails', rails_ver
+  rails_ver = ENV.fetch('RAILS_VERSION', '')
+  activeadmin_ver = ENV.fetch('ACTIVEADMIN_VERSION', '')
+
+  if rails_ver.empty?
+    gem 'rails'
+  else
+    gem 'rails', "~> #{rails_ver}"
+  end
+
+  if activeadmin_ver.empty?
+    gem 'activeadmin'
+  else
+    gem 'activeadmin', "~> #{activeadmin_ver}"
+  end
 
-  gem 'activeadmin', ENV.fetch('ACTIVEADMIN_VERSION')
   gem 'activeadmin_dynamic_fields', path: './'
   gem 'appraisal', '~> 2.4'
 
diff --git a/Makefile b/Makefile
@@ -1,38 +1,59 @@
+include extra/.env
+
 help:
-	@echo "Main targets: up / down / console / shell"
+	@echo "Main targets: build / specs / up / console / shell"
 
 # Docker commands
-down:
-	docker compose down
-
-up:
-	docker compose up
 
-attach:
-	docker compose attach app
+build:
+	@rm -f Gemfile.lock
+	@docker compose -f extra/docker-compose.yml build
 
-up_attach:
-	docker compose up -d && docker compose attach app
+up: build
+	@docker compose -f extra/docker-compose.yml up
 
 cleanup:
-	docker container rm -f activeadmin_dynamic_fields_app && docker image rm -f activeadmin_dynamic_fields-app
+	@docker compose -f extra/docker-compose.yml down -v --rmi local --remove-orphans
 
-# Rails specific commands
-console:
-	docker compose exec -e "PAGER=more" app bin/rails console
+# App commands
 
-routes:
-	docker compose exec app bin/rails routes
+server:
+	@docker compose -f extra/docker-compose.yml exec app bin/rails s -b 0.0.0.0 -p ${SERVER_PORT}
 
 specs:
-	docker compose exec app bin/rspec --fail-fast
+	@docker compose -f extra/docker-compose.yml exec app bin/rspec --fail-fast
+
+shell:
+	@docker compose -f extra/docker-compose.yml exec app bash
+
+
+# Docker commands
+# down:
+# 	docker compose down
+
+# up:
+# 	docker compose up
+
+# attach:
+# 	docker compose attach app
+
+# up_attach:
+# 	docker compose up -d && docker compose attach app
+
+# cleanup:
+# 	docker container rm -f activeadmin_dynamic_fields_app && docker image rm -f activeadmin_dynamic_fields-app
+
+# Rails specific commands
+# console:
+# 	docker compose exec -e "PAGER=more" app bin/rails console
+
+# specs:
+# 	docker compose exec app bin/rspec --fail-fast
 
 # Other commands
-bundle:
-	docker compose exec app bundle
 
-shell:
-	docker compose exec -e "PAGER=more" app bash
+# shell:
+# 	docker compose exec -e "PAGER=more" app bash
 
-lint:
-	docker compose exec app bin/rubocop
+# lint:
+# 	docker compose exec app bin/rubocop
diff --git a/Rakefile b/Rakefile
@@ -1,5 +1,16 @@
 # frozen_string_literal: true
 
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
+load 'rails/tasks/engine.rake'
+
+load 'rails/tasks/statistics.rake'
+
 require 'bundler/gem_tasks'
 
 begin
diff --git a/activeadmin_dynamic_fields.gemspec b/activeadmin_dynamic_fields.gemspec
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$:.push File.expand_path('lib', __dir__)
 require 'activeadmin/dynamic_fields/version'
 
 Gem::Specification.new do |spec|
diff --git a/bin/rails b/bin/rails
@@ -4,7 +4,7 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
-# ENV['RAILS_ENV'] ||= 'test'
+ENV['RAILS_ENV'] ||= 'development'
 
 ENGINE_ROOT = File.expand_path('..', __dir__)
 ENGINE_PATH = File.expand_path('../lib/activeadmin/dynamic_fields/engine', __dir__)
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/extra/.bashrc b/extra/.bashrc
@@ -0,0 +1,3 @@
+alias ls='ls --color'
+alias ll='ls -l'
+alias la='ls -la'
diff --git a/extra/.env b/extra/.env
@@ -0,0 +1,6 @@
+COMPOSE_PROJECT_NAME=activeadmin_dynamic_fields
+
+UID=1000
+GID=1000
+
+SERVER_PORT=4000
diff --git a/extra/Dockerfile b/extra/Dockerfile
@@ -1,21 +1,66 @@
+# ARG RUBY_IMAGE=ruby:3
+# FROM ${RUBY_IMAGE}
+
+# ARG ACTIVEADMIN_VERSION
+# ARG RAILS_VERSION
+# ARG UID
+
+# ENV DEVEL=1
+# ENV RAILS_ENV=development
+# ENV RAILS_VERSION=$RAILS_VERSION
+
+# ENV DEBIAN_FRONTEND=noninteractive
+# ENV LANG=C.UTF-8
+
+# RUN apt-get update -qq
+# RUN apt-get install -yqq --no-install-recommends build-essential chromium libyaml-dev nano
+
+# RUN gem install bundler -v 2.5.23
+# RUN echo 'gem: --no-document' > /etc/gemrc
+
+# 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
+
+# WORKDIR /app
+
+# COPY . /app
+# RUN bundle install
+
+# RUN bin/rails db:create db:migrate db:test:prepare
+# RUN chown -R app:app /app/spec/dummy/db
+
+# RUN ln -s /app/extra/.bashrc /home/app/.bashrc
+
+# ENTRYPOINT ["extra/entrypoint.sh"]
+
 ARG RUBY_IMAGE=ruby:3
 FROM ${RUBY_IMAGE}
 
-ARG UID
-
+ENV DEBIAN_FRONTEND=noninteractive
 ENV DEVEL=1
 ENV LANG=C.UTF-8
-ENV RAILS_ENV=development
 
 RUN apt-get update -qq
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -yqq --no-install-recommends build-essential chromium libyaml-dev nano
+RUN apt-get install -yqq --no-install-recommends build-essential chromium libyaml-dev nano netcat-traditional pkg-config
 
-RUN gem install bundler
+RUN gem install bundler -v 2.5.23
 RUN echo 'gem: --no-document' > /etc/gemrc
 
-RUN useradd -u ${UID} --shell /bin/bash app 
-RUN mkdir -p /home/app && chown -R app:app /home/app
+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 
 
-USER ${UID}
+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 ln -s /app/extra/.bashrc /home/app/.bashrc
diff --git a/extra/docker-compose.yml b/extra/docker-compose.yml
@@ -0,0 +1,22 @@
+services:
+  app:
+    build:
+      context: ..
+      dockerfile: extra/Dockerfile
+      # dockerfile: extra/Dockerfile_alpine
+      args:
+        ACTIVEADMIN_VERSION: ${ACTIVEADMIN:-}
+        RAILS_VERSION: ${RAILS:-}
+        # Debian-based Ruby image:
+        RUBY_IMAGE: ruby:3.4-slim
+        UID: ${UID}
+    user: ${UID}:${GID}
+    ports:
+      - ${SERVER_PORT}:${SERVER_PORT}
+    working_dir: /app
+    volumes:
+      - ..:/app
+      # - /app/spec/dummy/db
+    stdin_open: true
+    tty: true
+    command: ${COMMAND:-extra/init.sh}
diff --git a/extra/entrypoint.sh b/extra/entrypoint.sh
@@ -1,8 +1,4 @@
-echo "> Install dependencies"
-rm -f Gemfile.lock && bundle install
+#!/bin/sh
 
-echo "> Run pending migrations"
-cd spec/dummy && bundle exec rails db:migrate
-
-echo "> Start Rails server"
-cd /app && rm -f spec/dummy/tmp/pids/server.pid && bundle exec rails s -b 0.0.0.0
+echo "> Execute command"
+exec "$@"
diff --git a/extra/init.sh b/extra/init.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Setup database
+bin/rails db:reset db:test:prepare
+
+#
+sh
diff --git a/spec/dummy/config/database.yml b/spec/dummy/config/database.yml
@@ -1,5 +1,6 @@
 default: &default
   adapter: sqlite3
+  migrations_paths: spec/dummy/db_migrate
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   timeout: 5000
 
diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2018_06_07_053739) do
+ActiveRecord::Schema.define(version: 2018_06_07_053739) do
   create_table "active_admin_comments", force: :cascade do |t|
     t.string "namespace"
     t.text "body"
diff --git a/spec/dummy/db/schema_development.rb b/spec/dummy/db/schema_development.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2018_06_07_053739) do
+ActiveRecord::Schema.define(version: 2018_06_07_053739) do
   create_table "active_admin_comments", force: :cascade do |t|
     t.string "namespace"
     t.text "body"
diff --git a/spec/dummy/db_migrate/20170806125915_create_active_storage_tables.active_storage.rb b/spec/dummy/db_migrate/20170806125915_create_active_storage_tables.active_storage.rb
diff --git a/spec/dummy/db_migrate/20180101010101_create_active_admin_comments.rb b/spec/dummy/db_migrate/20180101010101_create_active_admin_comments.rb
diff --git a/spec/dummy/db_migrate/20180607053251_create_authors.rb b/spec/dummy/db_migrate/20180607053251_create_authors.rb
diff --git a/spec/dummy/db_migrate/20180607053254_create_profiles.rb b/spec/dummy/db_migrate/20180607053254_create_profiles.rb
diff --git a/spec/dummy/db_migrate/20180607053255_create_tags.rb b/spec/dummy/db_migrate/20180607053255_create_tags.rb
diff --git a/spec/dummy/db_migrate/20180607053257_create_post_tags.rb b/spec/dummy/db_migrate/20180607053257_create_post_tags.rb
diff --git a/spec/dummy/db_migrate/20180607053739_create_posts.rb b/spec/dummy/db_migrate/20180607053739_create_posts.rb
