diff --git a/.dockerignore b/.dockerignore index da20f14..5dac67c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -29,6 +29,7 @@ !/storage/.keep /tmp/storage/* !/tmp/storage/.keep +/tmp/cache/* # Ignore assets. /node_modules/ @@ -52,3 +53,6 @@ # Ignore test screenshots /public/shrine +/public/cache + +/doc diff --git a/app/assets/builds/application.css b/app/assets/builds/application.css index cbb345c..d322b34 100644 --- a/app/assets/builds/application.css +++ b/app/assets/builds/application.css @@ -7201,11 +7201,6 @@ a.black { height: 1.5em; } -.menu .menu-text { - font-size: 1.4rem; - line-height: 2rem; -} - /*! PhotoSwipe main CSS by Dmytro Semenov | photoswipe.com */ .pswp { --pswp-bg: #000; diff --git a/app/assets/stylesheets/my_styles.scss b/app/assets/stylesheets/my_styles.scss index c0fb3eb..647e1c9 100644 --- a/app/assets/stylesheets/my_styles.scss +++ b/app/assets/stylesheets/my_styles.scss @@ -631,8 +631,3 @@ a.black width: 1.5em; height: 1.5em; } - -.menu .menu-text { - font-size: 1.4rem; - line-height: 2; -} \ No newline at end of file diff --git a/config/database.yml b/config/database.yml index 011f2f8..9e8a11c 100644 --- a/config/database.yml +++ b/config/database.yml @@ -11,18 +11,18 @@ production: # database: storage/production.sqlite3 url: <%= ENV['DATABASE_URL'] %> pool: 10 - cache: - <<: *default - database: storage/production_cache.sqlite3 - migrations_paths: db/cache_migrate - queue: - <<: *default - database: storage/production_queue.sqlite3 - migrations_paths: db/queue_migrate - cable: - <<: *default - database: storage/production_cable.sqlite3 - migrations_paths: db/cable_migrate + # cache: + # <<: *default + # database: storage/production_cache.sqlite3 + # migrations_paths: db/cache_migrate + # queue: + # <<: *default + # database: storage/production_queue.sqlite3 + # migrations_paths: db/queue_migrate + # cable: + # <<: *default + # database: storage/production_cable.sqlite3 + # migrations_paths: db/cable_migrate development: <<: *default diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..2025541 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,23 @@ +version: '3' +services: + postgres: + image: postgres:16 + volumes: + - db_data:/var/lib/postgresql/data + environment: + POSTGRES_USER: debshots + POSTGRES_PASSWORD: debshots + POSTGRES_DB: debshots + web: + build: . + depends_on: + - postgres + #command: bash -c "rm -f tmp/pids/server.pid && rails server -b 0.0.0.0" + volumes: + - .:/opt/app + ports: + - "3333:3000" + environment: + DATABASE_URL: postgres://debshots:debshots@postgres:5432/debshots +volumes: + db_data: