Prepare the api docker

rafasimao · Nov 15, 2019 · 162ae79 · 162ae79
1 parent 9b0c701
commit 162ae79
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,4 @@
 composer.phar
 /vendor/
 
-# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
-# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
-# composer.lock
+/data
diff --git a/apps/api b/apps/api
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,6 @@ services:
   proxy.raiseup.local:
     image: nginx
     container_name: proxy
-    init: true
     volumes:
       - ./services/devproxy/conf.d:/etc/nginx/conf.d
     ports:
@@ -29,11 +28,10 @@ services:
     tty: true
     stdin_open: true
     container_name: api
-    init: true
     build:
       context: ./apps/api
-    env_file:
-      - ./config/api.env
+    # env_file:
+    #   - ./config/api.env
     volumes:
       - ./apps/api:/app
     ports:
@@ -44,7 +42,6 @@ services:
   database.riseup.local:
     image: postgres:12.0-alpine
     container_name: database
-    init: true
     volumes:
       - ./data/database:/var/lib/postgresql/data
     env_file:
+22 −45		.gitignore
+1 −0		.rspec
+1 −0		.ruby-version
+15 −0		Dockerfile
+24 −0		Gemfile
+198 −0		Gemfile.lock
+24 −1		README.md
+6 −0		Rakefile
+2 −0		app/controllers/application_controller.rb
+0 −0		app/controllers/concerns/.keep
+7 −0		app/jobs/application_job.rb
+3 −0		app/models/application_record.rb
+0 −0		app/models/concerns/.keep
+0 −0		app/views/.keep
+105 −0		bin/bundle
+9 −0		bin/rails
+9 −0		bin/rake
+33 −0		bin/setup
+17 −0		bin/spring
+5 −0		config.ru
+19 −0		config/application.rb
+4 −0		config/boot.rb
+1 −0		config/credentials.yml.enc
+85 −0		config/database.yml
+3 −0		config/environment.rb
+52 −0		config/environments/development.rb
+105 −0		config/environments/production.rb
+48 −0		config/environments/test.rb
+8 −0		config/initializers/application_controller_renderer.rb
+7 −0		config/initializers/backtrace_silencers.rb
+16 −0		config/initializers/cors.rb
+4 −0		config/initializers/filter_parameter_logging.rb
+16 −0		config/initializers/inflections.rb
+4 −0		config/initializers/mime_types.rb
+14 −0		config/initializers/wrap_parameters.rb
+2 −0		config/locales/en.yml
+31 −0		config/puma.rb
+2 −0		config/routes.rb
+6 −0		config/spring.rb
+34 −0		config/storage.yml
+7 −0		db/seeds.rb
+5 −0		docker-entrypoint.sh
+0 −0		lib/tasks/.keep
+0 −0		log/.keep
+1 −0		public/robots.txt
+63 −0		spec/rails_helper.rb
+96 −0		spec/spec_helper.rb
+0 −0		storage/.keep
+0 −0		tmp/.keep
+0 −0		vendor/.keep