misc development docker-compose.yml improvements (#1905)
* tweaks * selective bind mounts * code review: missing some files in bind mount
This commit is contained in:
		
				
					committed by
					
						
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							a581d9837a
						
					
				
				
					commit
					4b7bd98143
				
			@@ -4,6 +4,7 @@
 | 
				
			|||||||
version: "3"
 | 
					version: "3"
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  db:
 | 
					  db:
 | 
				
			||||||
 | 
					    container_name: wiki-db
 | 
				
			||||||
    image: postgres:9-alpine
 | 
					    image: postgres:9-alpine
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      POSTGRES_DB: wiki
 | 
					      POSTGRES_DB: wiki
 | 
				
			||||||
@@ -13,26 +14,22 @@ services:
 | 
				
			|||||||
      driver: "none"
 | 
					      driver: "none"
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - db-data:/var/lib/postgresql/data
 | 
					      - db-data:/var/lib/postgresql/data
 | 
				
			||||||
    networks:
 | 
					 | 
				
			||||||
      - wikinet
 | 
					 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
      - "15432:5432"
 | 
					      - "15432:5432"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  adminer:
 | 
					  adminer:
 | 
				
			||||||
 | 
					    container_name: wiki-adminer
 | 
				
			||||||
    image: adminer:latest
 | 
					    image: adminer:latest
 | 
				
			||||||
    logging:
 | 
					    logging:
 | 
				
			||||||
      driver: "none"
 | 
					      driver: "none"
 | 
				
			||||||
    networks:
 | 
					 | 
				
			||||||
      - wikinet
 | 
					 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
      - "3001:8080"
 | 
					      - "3001:8080"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # solr:
 | 
					  # solr:
 | 
				
			||||||
 | 
					  #   container_name: wiki-solr
 | 
				
			||||||
  #   image: solr:7-alpine
 | 
					  #   image: solr:7-alpine
 | 
				
			||||||
  #   logging:
 | 
					  #   logging:
 | 
				
			||||||
  #     driver: "none"
 | 
					  #     driver: "none"
 | 
				
			||||||
  #   networks:
 | 
					 | 
				
			||||||
  #     - wikinet
 | 
					 | 
				
			||||||
  #   ports:
 | 
					  #   ports:
 | 
				
			||||||
  #     - "8983:8983"
 | 
					  #     - "8983:8983"
 | 
				
			||||||
  #   volumes:
 | 
					  #   volumes:
 | 
				
			||||||
@@ -43,21 +40,19 @@ services:
 | 
				
			|||||||
  #     - wiki
 | 
					  #     - wiki
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  wiki:
 | 
					  wiki:
 | 
				
			||||||
 | 
					    container_name: wiki-app
 | 
				
			||||||
    build:
 | 
					    build:
 | 
				
			||||||
      context: ../..
 | 
					      context: ../..
 | 
				
			||||||
      dockerfile: dev/containers/Dockerfile
 | 
					      dockerfile: dev/containers/Dockerfile
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
      - db
 | 
					      - db
 | 
				
			||||||
    networks:
 | 
					 | 
				
			||||||
      - wikinet
 | 
					 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
      - "3000:3000"
 | 
					      - "3000:3000"
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - ../..:/wiki
 | 
					      - ../..:/wiki
 | 
				
			||||||
      - /wiki/node_modules
 | 
					      - /wiki/node_modules
 | 
				
			||||||
 | 
					      - /wiki/.git
 | 
				
			||||||
 | 
					
 | 
				
			||||||
networks:
 | 
					 | 
				
			||||||
  wikinet:
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
volumes:
 | 
					volumes:
 | 
				
			||||||
  db-data:
 | 
					  db-data:
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user