From 08398e149cebd0346f8436597edb3677d7c0f6f9 Mon Sep 17 00:00:00 2001 From: Joshua Hoshiko Date: Tue, 27 Feb 2024 09:58:40 -0700 Subject: [PATCH 1/3] added citrine compose file with tweaks to rabbitmq volume Signed-off-by: Joshua Hoshiko --- citrine-os/docker-compose.yml | 72 +++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 citrine-os/docker-compose.yml diff --git a/citrine-os/docker-compose.yml b/citrine-os/docker-compose.yml new file mode 100644 index 00000000..7f7ea131 --- /dev/null +++ b/citrine-os/docker-compose.yml @@ -0,0 +1,72 @@ +version: '3' +services: + amqp-broker: + image: rabbitmq:3-management + ports: + - 15672:15672 + - 5672:5672 + environment: + RABBITMQ_DEFAULT_USER: 'guest' + RABBITMQ_DEFAULT_PASS: 'guest' + # volumes: + # - ./data/rabbitmq:/var/lib/rabbitmq + volumes: + - ./data/rabbitmq:/var/lib/rabbitmq/mnesia + healthcheck: + test: rabbitmq-diagnostics -q ping + interval: 10s + timeout: 10s + retries: 3 + ocpp-db: + image: citrineos/postgres:preseeded + ports: + - 5432:5432 + volumes: + - ./data/postgresql/pgdata:/var/lib/postgresql/data + environment: + POSTGRES_DB: citrine + POSTGRES_USER: citrine + POSTGRES_PASSWORD: "citrine" + redis: + image: redis:latest + ports: + - "6379:6379" + healthcheck: + test: [ "CMD", "redis-cli", "ping" ] + interval: 10s + timeout: 5s + retries: 3 + citrine: + build: + context: ../ + dockerfile: ./Server/docker/Dockerfile + depends_on: + ocpp-db: + condition: service_started + amqp-broker: + condition: service_healthy + redis: + condition: service_healthy + ports: + - 8080:8080 + - 8081:8081 + - 8082:8082 + directus: + image: directus/directus:latest + ports: + - 8055:8055 + volumes: + - ./data/directus/uploads:/directus/uploads + - ./data/directus/extensions:/directus/extensions + environment: + KEY: '1234567890' + SECRET: '0987654321' + ADMIN_EMAIL: 'admin@citrineos.com' + ADMIN_PASSWORD: 'CitrineOS!' + DB_CLIENT: 'pg' + DB_HOST: ocpp-db + DB_PORT: 5432 + DB_DATABASE: 'citrine' + DB_USER: 'citrine' + DB_PASSWORD: 'citrine' + WEBSOCKETS_ENABLED: 'true' From 625273f6e22ea166c43a45245a0c9266a869b648 Mon Sep 17 00:00:00 2001 From: Joshua Hoshiko Date: Mon, 4 Mar 2024 15:20:58 -0700 Subject: [PATCH 2/3] renamed 1.6j json config Signed-off-by: Joshua Hoshiko --- manager/{config-docker.json => config-docker-16j.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename manager/{config-docker.json => config-docker-16j.json} (100%) diff --git a/manager/config-docker.json b/manager/config-docker-16j.json similarity index 100% rename from manager/config-docker.json rename to manager/config-docker-16j.json From 29e6780ab4ae18e03476baa6d6d843df699e0789 Mon Sep 17 00:00:00 2001 From: Joshua Hoshiko Date: Mon, 4 Mar 2024 15:25:28 -0700 Subject: [PATCH 3/3] updated manager dockerfile to copy both the 1.6j and 2.0.1 json config files Signed-off-by: Joshua Hoshiko --- manager/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manager/Dockerfile b/manager/Dockerfile index e9c5d167..5670b641 100644 --- a/manager/Dockerfile +++ b/manager/Dockerfile @@ -19,7 +19,8 @@ RUN git clone https://github.com/EVerest/everest-core.git \ && /entrypoint.sh run-script install # Copy over the custom config *after* compilation and installation -COPY config-docker.json ./dist/share/everest/modules/OCPP/config-docker.json +COPY config-docker-16j.json ./dist/share/everest/modules/OCPP/config-docker-16j.json +COPY config-docker-201.json ./dist/share/everest/modules/OCPP/config-docker-201.json # TODO: This should be removed once added to everest-core COPY ./tests/startup_tests.py /ext/source/tests/core_tests/startup_tests.py