This commit is contained in:
		@@ -1,3 +1,5 @@
 | 
			
		||||
version: '3.4'
 | 
			
		||||
 | 
			
		||||
networks:
 | 
			
		||||
  cnc:
 | 
			
		||||
    external: false
 | 
			
		||||
@@ -8,7 +10,7 @@ services:
 | 
			
		||||
    restart: always
 | 
			
		||||
    environment:
 | 
			
		||||
      - POSTGRES_USER=cnc-service
 | 
			
		||||
      - POSTGRES_PASSWORD=cnc-service
 | 
			
		||||
      - POSTGRES_PASSWORD=cnc-service-supersecret
 | 
			
		||||
      - POSTGRES_DB=cnc-service
 | 
			
		||||
    networks:
 | 
			
		||||
      - cnc
 | 
			
		||||
@@ -29,6 +31,20 @@ services:
 | 
			
		||||
    depends_on:
 | 
			
		||||
      - activemq
 | 
			
		||||
      - postgres
 | 
			
		||||
    environment:
 | 
			
		||||
      SENTRY_DSN: https://8774ab5831814316a6aa33d07f94281c@sentry.kmlabz.com/8
 | 
			
		||||
      RELEASE_ID: compose
 | 
			
		||||
      CNC_SERVICE_RELEASEMODE: dev
 | 
			
		||||
      CNC_POSTGRES_HOSTNAME: postgres
 | 
			
		||||
      CNC_POSTGRES_USERNAME: cnc-service
 | 
			
		||||
      CNC_POSTGRES_PASSWORD: cnc-service-supersecret
 | 
			
		||||
      CNC_POSTGRES_DB: cnc-service
 | 
			
		||||
      CNC_MQTT_HOSTNAME: activemq
 | 
			
		||||
      CNC_MQTT_PORT: "1883"
 | 
			
		||||
      CNC_MQTT_USERNAME: artemis
 | 
			
		||||
      CNC_MQTT_PASSWORD: artemis
 | 
			
		||||
      CNC_MQTT_STATUS_TOPIC: status
 | 
			
		||||
      CNC_MQTT_COMMAND_TOPIC: command
 | 
			
		||||
    networks:
 | 
			
		||||
      - cnc
 | 
			
		||||
    ports:
 | 
			
		||||
 
 | 
			
		||||
@@ -8,4 +8,5 @@ marshmallow
 | 
			
		||||
marshmallow-sqlalchemy
 | 
			
		||||
flask-marshmallow
 | 
			
		||||
paho-mqtt
 | 
			
		||||
flask-mqtt
 | 
			
		||||
flask-mqtt
 | 
			
		||||
psycopg2
 | 
			
		||||
 
 | 
			
		||||
@@ -27,8 +27,8 @@ POSTGRES_DB = os.getenv("CNC_POSTGRES_DB", "cnc-service")
 | 
			
		||||
 | 
			
		||||
MQTT_HOSTNAME = os.getenv("CNC_MQTT_HOSTNAME", "localhost")
 | 
			
		||||
MQTT_PORT = os.getenv("CNC_MQTT_PORT", "1883")
 | 
			
		||||
MQTT_USERNAME = os.getenv("CNC_MQTT_USERNAME", "guard-service")
 | 
			
		||||
MQTT_PASSWORD = os.getenv("CNC_MQTT_PASSWORD", "guard-service")
 | 
			
		||||
MQTT_STATUS_TOPIC = os.getenv("CNC_MQTT_STATUS_TOPIC", "guard-service")
 | 
			
		||||
MQTT_COMMAND_TOPIC = os.getenv("CNC_MQTT_COMMAND_TOPIC", "guard-service")
 | 
			
		||||
MQTT_USERNAME = os.getenv("CNC_MQTT_USERNAME", "cnc-service")
 | 
			
		||||
MQTT_PASSWORD = os.getenv("CNC_MQTT_PASSWORD", "cnc-service")
 | 
			
		||||
MQTT_STATUS_TOPIC = os.getenv("CNC_MQTT_STATUS_TOPIC", "cnc-service")
 | 
			
		||||
MQTT_COMMAND_TOPIC = os.getenv("CNC_MQTT_COMMAND_TOPIC", "cnc-service")
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user