diff --git a/config/environments/development.rb b/config/environments/development.rb index ab93e9bb..8780cd59 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -48,7 +48,7 @@ module OptimizerWrapper OptimizerLogger.level = ENV['LOG_LEVEL']&.to_sym || :debug OptimizerLogger.with_datetime = true - OptimizerLogger.caller_location = ENV['CALLER_LOCATION'].presence.to_sym || :relative + OptimizerLogger.caller_location = ENV['CALLER_LOCATION'].presence&.to_sym || :absolute @@c = { product_title: 'Optimizers API', diff --git a/docker-compose.yml b/docker-compose.yml index 6c640f6a..b402329f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,14 +18,15 @@ x-default-service: &default-service # - redis-cache volumes: - .:/srv/app - - ./docker/production.rb:/srv/app/config/environments/production.rb - - ./docker/production.rb:/srv/app/config/environments/development.rb services: - api: + optimizer-server: <<: *default-service ports: - "8083:80" # HOST:CONTAINER, edit only HOST part + networks: + - private-network + - public-network command: bundle exec puma -v -p 80 --pidfile 'server.pid' restart: unless-stopped @@ -35,14 +36,25 @@ services: <<: *default-environment COUNT: 5 QUEUES: DEFAULT + networks: + - private-network command: bundle exec rake resque:workers --trace restart: unless-stopped redis-resque: image: redis:${REDIS_VERSION:-7-alpine} + networks: + - private-network command: redis-server --appendonly yes restart: unless-stopped +networks: + private-network: + external: false + + public-network: + name: public-network + # redis-cache: # image: redis:${REDIS_VERSION:-7-alpine} # command: redis-server --save ""