From bb1f82076a277c83be0a09d2e9494b47b1832173 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Fri, 15 Mar 2024 23:45:48 +0100 Subject: [PATCH] Update the docker-compose.yml file to use the dawarich network --- app/controllers/points_controller.rb | 4 +++- dev-docker-entrypoint.sh | 2 +- docker-compose.yml | 12 ++++-------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/controllers/points_controller.rb b/app/controllers/points_controller.rb index 298eb813..c473f5f5 100644 --- a/app/controllers/points_controller.rb +++ b/app/controllers/points_controller.rb @@ -1,6 +1,8 @@ class PointsController < ApplicationController + before_action :authenticate_user! + def index - @points = Point.all + @points = current_user.points @coordinates = @points.as_json(only: [:latitude, :longitude]) end diff --git a/dev-docker-entrypoint.sh b/dev-docker-entrypoint.sh index 71bbcf37..76b95cf4 100644 --- a/dev-docker-entrypoint.sh +++ b/dev-docker-entrypoint.sh @@ -8,7 +8,7 @@ echo "Environment: $RAILS_ENV" rm -f $APP_PATH/tmp/pids/server.pid # Wait for the database to be ready -until nc -zv wardu_db 5432; do +until nc -zv $DATABASE_HOST 5432; do echo "Waiting for PostgreSQL to be ready..." sleep 1 done diff --git a/docker-compose.yml b/docker-compose.yml index d18aa6a4..0a7dac0a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,16 +1,14 @@ version: '3' networks: - development: + dawarich: services: dawarich_redis: image: redis:7.0-alpine command: redis-server networks: - - development + - dawarich volumes: - shared_data:/var/shared/redis - ports: - - 6379:6379 dawarich_db: image: postgres:14.2-alpine container_name: dawarich_db @@ -18,19 +16,17 @@ services: - db_data:/var/lib/postgresql/data - shared_data:/var/shared networks: - - development + - dawarich environment: POSTGRES_USER: postgres POSTGRES_PASSWORD: password - ports: - - 5099:5432 dawarich_app: image: registry.chibi.rodeo/dawarich:latest container_name: dawarich_app volumes: - gem_cache:/usr/local/bundle/gems networks: - - development + - dawarich ports: - 3000:3000 stdin_open: true