diff --git a/Meridian/docker-compose.yml b/Meridian/docker-compose.yml deleted file mode 100644 index 8b868f8..0000000 --- a/Meridian/docker-compose.yml +++ /dev/null @@ -1,65 +0,0 @@ -version: '3.8' - -services: - meridian: - container_name: meridian - image: aboveu/meridian:latest - env_file: - - .env - ports: - - "3000:3000" - depends_on: - - postgres - - flighttime - networks: - - internal - - proxy - labels: - ## Expose Meridian Through Trefik ## - - "traefik.enable=true" # <== Enable traefik to proxy this container - - - "traefik.http.middlewares.redirect-web-secure.redirectscheme.scheme=https" - - "traefik.http.routers.meridian-insecure.middlewares=redirect-web-secure" - - "traefik.http.routers.meridian-insecure.rule=Host(`meridian.luke-else.co.uk`)" - - "traefik.http.routers.meridian-insecure.entrypoints=web" - - - "traefik.http.routers.meridian.rule=Host(`meridian.luke-else.co.uk`)" - - "traefik.http.routers.meridian.entrypoints=websecure" - - "traefik.http.routers.meridian.tls.certresolver=myresolver" - restart: unless-stopped - - postgres: - container_name: postgres - image: postgres:16 - env_file: - - .env - environment: - POSTGRES_DB: ${POSTGRES_DB} - POSTGRES_USER: ${POSTGRES_USER} - POSTGRES_PASSWORD: ${POSTGRES_PASS} - volumes: - - pgdata:/var/lib/postgresql/data - - ./scripts/init_db.sql:/docker-entrypoint-initdb.d/1-init_db.sql:ro - - ./scripts/core_migration.sql:/docker-entrypoint-initdb.d/2-core_migrations.sql:ro - - ./scripts/airline_alliances.sql:/docker-entrypoint-initdb.d/3-airline_alliances.sql:ro - networks: - - internal - restart: unless-stopped - - flighttime: - container_name: flighttime - image: aboveu/flighttime:latest - ports: - - "5000:5000" - networks: - - internal - restart: unless-stopped - -volumes: - pgdata: - -networks: - internal: - driver: bridge - proxy: - external: true \ No newline at end of file diff --git a/main-spindown.sh b/main-spindown.sh index 18ec992..f8b37c7 100644 --- a/main-spindown.sh +++ b/main-spindown.sh @@ -4,10 +4,6 @@ cd ./Websites/ docker-compose down cd .. -cd ./Meridian/ -docker-compose down -cd .. - cd ./Tracking/ docker-compose down cd .. diff --git a/main-spinup.sh b/main-spinup.sh index 2f03f0e..71b1811 100644 --- a/main-spinup.sh +++ b/main-spinup.sh @@ -18,10 +18,6 @@ cd ./Websites/ docker-compose pull && docker-compose up -d cd .. -cd ./Meridian/ -docker-compose pull && docker-compose up -d -cd .. - cd ./Database/ docker-compose pull && docker-compose up -d cd .. diff --git a/todo.md b/todo.md index 72ea731..111f77e 100644 --- a/todo.md +++ b/todo.md @@ -52,7 +52,3 @@ ACKEE_PASSWORD=XXX - Ensure that mysql root password, user and default database are updated. - Ensure that mongo root password, and user are updated. - Ensure database ports are correctly assigned and do not have to pass through traefik. - -## Meridian - -- Copy .env_example to a .env file and insert all the correct params