Xplatform

.dockerignore

@@ -1,2 +1,4 @@
 node_modules
 data
+dist
+database

Makefile

@@ -25,13 +25,6 @@ ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 # Define the full path to this file
 THIS_FILE := $(lastword $(MAKEFILE_LIST))
 
-# Set docker-compose file selector for windows
-ifneq (,$(findstring WINDOWS,$(PATH)))
-DC_CONFIG=$(ROOT_DIR)/docker-compose-windows.yml
-else
-DC_CONFIG=$(ROOT_DIR)/docker-compose.yml
-endif
-
 # Find or create a home for sensitive environment variables
 # Check my secret place
 CREDS=$(HOME)/.bash/.credentials
@@ -95,7 +88,7 @@ time-sync:
 	docker run --rm --privileged alpine hwclock -s
 
 up:
-	$(SUDO) docker-compose --file=$(DC_CONFIG) up
+	$(SUDO) docker-compose up -d
 
 start:
 	docker-compose start
@@ -108,13 +101,16 @@ state:
 
 rebuild:
 	$(SUDO) docker-compose stop
-	$(SUDO) docker-compose pull
 	$(SUDO) docker-compose rm --force server
 	$(SUDO) docker-compose rm --force mongodb
 	-$(SUDO) docker-compose rm --force adminmongo
+	-$(SUDO) docker rmi zenbot_server
+	-$(SUDO) docker rmi mongo
+	-$(SUDO) docker rmi adminmongo
+	$(SUDO) docker volume prune --force
+	$(SUDO) docker-compose pull
 	$(SUDO) docker-compose build --no-cache
-	$(SUDO) docker-compose --file=$(DC_CONFIG) up -d --force-recreate
-
+	$(SUDO) docker-compose  up -d --force-recreate
 
 shell:
 	docker-compose exec server /bin/sh

docker-compose.yml

@@ -14,14 +14,16 @@ services:
     tty: true
     ports:
       - "17365:17365"
+    expose: 
+      - 17365
     depends_on:
       - mongodb
     environment:
       - MONGODB_PORT_27017_TCP_ADDR=mongodb
   mongodb:
     image: mongo:latest
     volumes:
-      - ./database:/data/db
+      - /data/db
     command: mongod --smallfiles --bind_ip=0.0.0.0 --logpath=/dev/null
     expose:
       - 27017