forked from External/greenlight
		
	GRN2-162: Revert to sqlite in docker compose (#594)
* Revert to sqlite * Missed uncomenting sqlite volume * Update sample.env
This commit is contained in:
		
				
					committed by
					
						
						Jesus Federico
					
				
			
			
				
	
			
			
			
						parent
						
							98f7afb9a1
						
					
				
				
					commit
					e153528fcc
				
			@@ -8,7 +8,7 @@ services:
 | 
				
			|||||||
    env_file: .env
 | 
					    env_file: .env
 | 
				
			||||||
    restart: unless-stopped
 | 
					    restart: unless-stopped
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
      - 5000:80
 | 
					      - 127.0.0.1:5000:80
 | 
				
			||||||
# When using external logging
 | 
					# When using external logging
 | 
				
			||||||
#    logging:
 | 
					#    logging:
 | 
				
			||||||
#      driver: $LOG_DRIVER
 | 
					#      driver: $LOG_DRIVER
 | 
				
			||||||
@@ -18,19 +18,19 @@ services:
 | 
				
			|||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - ./log:/usr/src/app/log
 | 
					      - ./log:/usr/src/app/log
 | 
				
			||||||
# When using sqlite3 as the database
 | 
					# When using sqlite3 as the database
 | 
				
			||||||
#      - ./db/production:/usr/src/app/db/production
 | 
					      - ./db/production:/usr/src/app/db/production
 | 
				
			||||||
# When using postgresql as the database
 | 
					# When using postgresql as the database
 | 
				
			||||||
    links:
 | 
					#    links:
 | 
				
			||||||
      - db
 | 
					#      - db
 | 
				
			||||||
  db:
 | 
					#  db:
 | 
				
			||||||
    image: postgres:9.5
 | 
					#    image: postgres:9.5
 | 
				
			||||||
    restart: on-failure
 | 
					#    restart: on-failure
 | 
				
			||||||
    ports:
 | 
					#    ports:
 | 
				
			||||||
      - 5432:5432
 | 
					#      - 127.0.0.1:5432:5432
 | 
				
			||||||
    volumes:
 | 
					#    volumes:
 | 
				
			||||||
      - ./db/production:/var/lib/postgresql/data
 | 
					#      - ./db/production:/var/lib/postgresql/data
 | 
				
			||||||
    environment:
 | 
					#    environment:
 | 
				
			||||||
      - PGHOST=postgres
 | 
					#      - PGHOST=postgres
 | 
				
			||||||
      - PGDATABASE=postgres
 | 
					#      - PGDATABASE=postgres
 | 
				
			||||||
      - PGUSER=postgres
 | 
					#      - PGUSER=postgres
 | 
				
			||||||
      - PGPASSWORD=password
 | 
					#      - PGPASSWORD=password
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										13
									
								
								sample.env
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								sample.env
									
									
									
									
									
								
							@@ -188,11 +188,10 @@ ENABLE_GOOGLE_CALENDAR_BUTTON=
 | 
				
			|||||||
# DB_USERNAME=postgres
 | 
					# DB_USERNAME=postgres
 | 
				
			||||||
# DB_PASSWORD=password
 | 
					# DB_PASSWORD=password
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Note that the example provided, works for deployments based on the docker-compose script wich is also included. 
 | 
					# For deployments based on the docker-compose script also included, the HOST should be set with the Docker container id.
 | 
				
			||||||
# But should you need to use an external Postgres server, the right values for HOST, USERNAME and PASSWORD should be applied.
 | 
					 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
DB_ADAPTER=postgresql
 | 
					# DB_ADAPTER=postgresql
 | 
				
			||||||
DB_HOST=db
 | 
					# DB_HOST=db
 | 
				
			||||||
DB_NAME=greenlight_production
 | 
					# DB_NAME=greenlight_production
 | 
				
			||||||
DB_USERNAME=postgres
 | 
					# DB_USERNAME=postgres
 | 
				
			||||||
DB_PASSWORD=password
 | 
					# DB_PASSWORD=password
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user