diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..d086d61 Binary files /dev/null and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index 1b10823..1936073 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ node_modules/ .idea/ .vscode/ -.vs/ \ No newline at end of file +.vs/ +.DS_Store +/.meteor \ No newline at end of file diff --git a/.meteor/.DS_Store b/.meteor/.DS_Store new file mode 100644 index 0000000..f67c3d2 Binary files /dev/null and b/.meteor/.DS_Store differ diff --git a/docker-compose.yml b/docker-compose.yml index 606e49c..c3af921 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,28 +1,48 @@ version: "3" services: - smartgarden-meteor: + server: image: tvm/smart_garden:latest build: context: . dockerfile: Dockerfile restart: always environment: - ROOT_URL: ${APP_ROOT_URL:-https://smartgarden.timovolkmann.de} - MONGO_URL: mongodb://garden:99009911@cloud.timovolkmann.de:27017/Smart_Garden + ROOT_URL: ${APP_ROOT_URL:-http://smartgarden.timovolkmann.de} + MONGO_URL: mongodb://admin:03112546@mongo:27017/Smart_Garden PORT: 3000 labels: - traefik.enable=true - traefik.http.routers.smartgarden-meteor-http.rule=Host(`smartgarden.timovolkmann.de`) - traefik.http.routers.smartgarden-meteor-http.entrypoints=web - - traefik.http.routers.smartgarden-meteor-http.middlewares=https-redirect@file - - traefik.http.routers.smartgarden-meteor-https.rule=Host(`smartgarden.timovolkmann.de`) - - traefik.http.routers.smartgarden-meteor-https.entrypoints=web-secure - - traefik.http.routers.smartgarden-meteor-https.tls.certresolver=le + # - traefik.http.routers.smartgarden-meteor-http.middlewares=https-redirect@file + # - traefik.http.routers.smartgarden-meteor-https.rule=Host(`smartgarden.timovolkmann.de`) + # - traefik.http.routers.smartgarden-meteor-https.entrypoints=web-secure + # - traefik.http.routers.smartgarden-meteor-https.tls.certresolver=le - traefik.http.services.smartgarden-meteor-service.loadbalancer.server.port=3000 - traefik.docker.network=traefik_default networks: - traefik_default + mqtt: + image: eclipse-mosquitto + restart: always + ports: + - 1883:1883 + mongo: + image: mongo:latest + volumes: + - db-data:/data/db + - mongo-config:/data/configdb + ports: + - 27017:27017 + environment: + - MONGO_INITDB_ROOT_USERNAME=admin + - MONGO_INITDB_ROOT_PASSWORD=03112546 + - MONGO_INITDB_DATABASE=Smart_Garden + +volumes: + db-data: + mongo-config: networks: traefik_default: