Skip to content

Commit

Permalink
Update pointers to old GitHub organization
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Moore <[email protected]>
  • Loading branch information
drmrd committed Dec 6, 2023
1 parent 463d1c5 commit c76ddbc
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ The use cases supported by the three demos are summarized in conceptual block di
- 🚨 ISO 15118 DC Charging ⚡: `curl https://raw.githubusercontent.com/everest/everest-demo/main/demo-iso15118-2-dc.sh | bash`
- 🚨 Two EVSE Charging ⚡: `curl https://raw.githubusercontent.com/everest/everest-demo/main/demo-two-evse.sh | bash`
- 🚨 E2E Automated Tests ⚡: `curl https://raw.githubusercontent.com/everest/everest-demo/main/demo-automated-testing.sh | bash`
- 🚨 Basic and ISO 15118-2 AC Charging with OCPP 1.6J CSMS ⚡: `curl https://raw.githubusercontent.com/US-JOET/everest-demo/main/demo-iso15118-2-ac-plus-ocpp16j.sh | bash`
- 🚨 Basic and ISO 15118-2 AC Charging with OCPP 1.6J CSMS ⚡: `curl https://raw.githubusercontent.com/everest/everest-demo/main/demo-iso15118-2-ac-plus-ocpp16j.sh | bash`

### STEP 2: Interact with the demo
- Open the `nodered` flows to understand the module flows at http://127.0.0.1:1880
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.automated-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ version: "3.6"

services:
mqtt-server:
image: ghcr.io/us-joet/everest-demo/mqtt-server:${TAG}
image: ghcr.io/everest/everest-demo/mqtt-server:${TAG}
logging:
driver: none

manager:
image: ghcr.io/us-joet/everest-demo/manager:${TAG}
image: ghcr.io/everest/everest-demo/manager:${TAG}
depends_on:
- mqtt-server
environment:
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.ocpp16j.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ version: "3.6"

services:
mqtt-server:
image: ghcr.io/us-joet/everest-demo/mqtt-server:${TAG}
image: ghcr.io/everest/everest-demo/mqtt-server:${TAG}
platform: linux/x86_64
logging:
driver: none

manager:
image: ghcr.io/us-joet/everest-demo/manager:${TAG}
image: ghcr.io/everest/everest-demo/manager:${TAG}
platform: linux/x86_64
depends_on:
- mqtt-server
Expand All @@ -19,7 +19,7 @@ services:
- net.ipv6.conf.all.disable_ipv6=0

ocpp-db:
image: ghcr.io/us-joet/everest-demo/ocpp-db-compiled:0.0.1
image: ghcr.io/everest/everest-demo/ocpp-db-compiled:0.0.1
command: [ "--datadir", "/var/lib/mysql-no-volume" ]
ports:
- 13306:3306
Expand All @@ -30,15 +30,15 @@ services:
MYSQL_PASSWORD: ocpp

steve:
image: ghcr.io/us-joet/everest-demo/steve-configured:0.0.1
image: ghcr.io/everest/everest-demo/steve-configured:0.0.1
ports:
- 8180:8180
- 8443:8443
depends_on:
- ocpp-db

nodered:
image: ghcr.io/us-joet/everest-demo/nodered:${TAG}
image: ghcr.io/everest/everest-demo/nodered:${TAG}
depends_on:
- mqtt-server
ports:
Expand Down
16 changes: 8 additions & 8 deletions steve/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ OCPP Central System for the OCPP 1.6J demo.
## Looking for the SteVe OCPP 1.6J demo?
You've gone to far! Please visit the root directory of this repository to find the OCPP 1.6J Docker Compose file and a one-liner in the README.md for executing it.

## US-JOET Developers Only: Build & Configuration Process
## For Demo Developers Only: Build & Configuration Process
There are currently automated and manual steps to building this image.

First, a SteVe image is created without chargers or OCPP ID tags configured and stood up as a service using Docker Compose. This can be done by running the following command from the root of this Git repository:
Expand All @@ -28,28 +28,28 @@ The remainder of the setup process is manual:
9. Repeat steps 6--8 for two additional OCPP ID tags with the following attributes:
- `ID Tag`: `ABC12345`, `Max. Active Transaction Count`: `1`
- `ID Tag`: `VID:AABBCCDDEEFF`, `Max. Active Transaction Count`: `0`
10. Visit the [US-JOET steve-configured package page](https://github.com/US-JOET/everest-demo/pkgs/container/everest-demo%2Fsteve-configured) on GitHub and determine the most recent `A.B.C` tag for this image.
10. Visit the [EVerest steve-configured package page](https://github.com/EVerest/everest-demo/pkgs/container/everest-demo%2Fsteve-configured) on GitHub and determine the most recent `A.B.C` tag for this image.
11. Use [semantic versioning](https://semver.org) to determine what the appropriate updated tag is for your new version of the `steve-configured` image.
12. From a terminal, commit the running SteVe container using
```shell
docker commit everest-demo-steve-1 ghcr.io/us-joet/everest-demo/steve-configured:X.Y.Z
docker commit everest-demo-steve-1 ghcr.io/everest/everest-demo/steve-configured:X.Y.Z
```
where `X.Y.Z` should be replaced with the new semantic version for the image you determined in step 11.
13. Repeat steps 10--12 for the running MariaDB container and [US-JOET `ocpp-db-compiled` image](https://github.com/US-JOET/everest-demo/pkgs/container/everest-demo%2Focpp-db-compiled). Your Docker Commit command should look like the following:
13. Repeat steps 10--12 for the running MariaDB container and [EVerest `ocpp-db-compiled` image](https://github.com/EVerest/everest-demo/pkgs/container/everest-demo%2Focpp-db-compiled). Your Docker Commit command should look like the following:
```shell
docker commit everest-demo-ocpp-db-1 ghcr.io/us-joet/everest-demo/ocpp-db-compiled:X.Y.Z
docker commit everest-demo-ocpp-db-1 ghcr.io/everest/everest-demo/ocpp-db-compiled:X.Y.Z
```
again replacing `X.Y.Z` with the relevant semantic version from step 11.
14. Push each of these newly-created image versions to the US-JOET project with
14. Push each of these newly-created image versions to the EVerest project with
```shell
# Remember to replace the X.Y.Z with your new version tag!
docker push ghcr.io/us-joet/everest-demo/steve-configured:X.Y.Z
docker push ghcr.io/everest/everest-demo/steve-configured:X.Y.Z
```
and
```shell
# Remember to replace the X.Y.Z with your new version tag!
docker push ghcr.io/us-joet/everest-demo/ocpp-db-compiled:X.Y.Z
docker push ghcr.io/everest/everest-demo/ocpp-db-compiled:X.Y.Z
```

> **Note:** The OCPP ID tags are configured so that `DEADBEEF` (the default) can authenticate against two chargers simultaneously (that is, can be involved in two concurrent transactions). In contrast, `ABC12345` can only work one charger at a time, and `VID:AABBCCDDEEFF` is blocked entirely from charging vehicles. Choosing different combinations of demo connectors and OCPP tags (as well as authenticating before/after plugging in a simulated vehicle) can demonstrate a variety of basic authentication scenarios. The configurations for these IDs can be modified within the SteVe administration webapp to support other scenarios.
Expand Down

0 comments on commit c76ddbc

Please sign in to comment.