Skip to content

Commit d51634b

Browse files
miles-grant-ibigroupmiles-grant-ibigroup
authored
Merge pull request #1023 from ibi-group/remove-project-otp-configs
remove project-wide deployment settings
2 parents dce68d2 + 3e75008 commit d51634b

File tree

9 files changed

+22
-698
lines changed

9 files changed

+22
-698
lines changed

‎.github/workflows/node-ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ jobs:
7474
- name: Run e2e tests
7575
if: inputs.e2e
7676
run: |
77-
(echo "E2E Test Attempt 1" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
78-
(echo "E2E Test Attempt 2" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
79-
(echo "E2E Test Attempt 3" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
77+
(echo "E2E Test Attempt 1" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
78+
(echo "E2E Test Attempt 2" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
79+
(echo "E2E Test Attempt 3" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
8080
(echo "E2E Tests Failed" && exit 1)
8181
# At this point, the build is successful.
8282
- name: Semantic Release

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ A pre-configured datatools instance can be lauched via Docker by running
1111
```bash
1212
cd docker
1313
cp ../configurations/default/env.yml.tmp ../configurations/default/env.yml
14-
docker-compose up
14+
docker compose up
1515
```
1616

1717
from the datatools-ui directory. Datatools will then be running on port `9966`.

‎docs/dev/development.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ yarn start -- --config /path/to/config
4747

4848
## E2E tests
4949

50-
The e2e tests have been Dockerized, which allows them to be run easily anywhere `docker-compose` works. To run them on localhost, first create a `.env` file in the `__tests__/e2e`. `docker-compose` will alert you as to which variables must be present.
50+
The e2e tests have been Dockerized, which allows them to be run easily anywhere `docker compose` works. To run them on localhost, first create a `.env` file in the `__tests__/e2e`. `docker compose` will alert you as to which variables must be present.
5151

52-
To run the tests, run `docker-compose -f docker-compose.yml up --abort-on-container-exit` in the `__tests__/e2e/` directory.
52+
To run the tests, run `docker compose -f docker compose.yml up --abort-on-container-exit` in the `__tests__/e2e/` directory.

‎i18n/english.yml

-104
Original file line numberDiff line numberDiff line change
@@ -135,49 +135,6 @@ components:
135135
danger: Danger!
136136
success: Success!
137137
warning: Warning!
138-
DeploymentSettings:
139-
boundsPlaceholder: 'min_lon, min_lat, max_lon, max_lat'
140-
buildConfig:
141-
elevationBucket:
142-
accessKey: Access Key
143-
bucketName: S3 Bucket Name
144-
secretKey: Secret Key
145-
fares: Fares
146-
fetchElevationUS: Fetch Elevation
147-
save: Save
148-
stationTransfers: Sta. Transfers
149-
subwayAccessTime: Subway Access Time
150-
title: Build Config
151-
clear: Clear
152-
manageServers: Manage deployment servers
153-
osm:
154-
bounds: Custom Extract Bounds
155-
custom: Use Custom Extract Bounds
156-
gtfs: Use GTFS-Derived Extract Bounds
157-
title: OSM Extract
158-
routerConfig:
159-
brandingUrlRoot: Branding URL Root
160-
carDropoffTime: Car Dropoff Time
161-
driveDistanceReluctance: Drive Distance Reluctance
162-
numItineraries: '# of itineraries'
163-
requestLogFile: Request log file
164-
stairsReluctance: Stairs Reluctance
165-
title: Router Config
166-
itineraryFilters:
167-
nonTransitGeneralizedCostLimit: Non-Transit Generalized Cost Limit
168-
updaters:
169-
$index:
170-
feedId: Feed ID
171-
frequencySec: Frequency (in seconds)
172-
sourceType: Source type
173-
type: Type
174-
url: URL
175-
new: Add updater
176-
title: Real-time updaters
177-
placeholder: Updater name
178-
walkSpeed: Walk Speed
179-
save: Save
180-
title: Deployment
181138
DeploymentVersionsTable:
182139
dateRetrieved: Date Retrieved
183140
errorCount: Error Count
@@ -578,7 +535,6 @@ components:
578535
custom: Use Custom Extract Bounds
579536
gtfs: Use GTFS-Derived Extract Bounds
580537
title: OSM Extract
581-
title: Deployment
582538
routerConfig:
583539
brandingUrlRoot: Branding URL Root
584540
carDropoffTime: Car Dropoff Time
@@ -935,66 +891,6 @@ components:
935891
noAccess: No Access
936892
permissions: Permissions
937893
title: Project Settings for
938-
ProjectSettings:
939-
deployment:
940-
buildConfig:
941-
elevationBucket:
942-
accessKey: Access Key
943-
bucketName: S3 Bucket Name
944-
secretKey: Secret Key
945-
fares: Fares
946-
fetchElevationUS: Fetch Elevation
947-
stationTransfers: Sta. Transfers
948-
subwayAccessTime: Subway Access Time
949-
title: Build Config
950-
osm:
951-
bounds: Custom Extract Bounds
952-
custom: Use Custom Extract Bounds
953-
gtfs: Use GTFS-Derived Extract Bounds
954-
title: OSM Extract
955-
otpServers:
956-
$index:
957-
admin: Admin access only?
958-
delete: Remove
959-
internalUrl: Internal URLs
960-
name: Name
961-
namePlaceholder: Production
962-
publicUrl: Public URL
963-
r5: R5 Server?
964-
s3Bucket: S3 bucket name
965-
targetGroupArn: Target Group ARN
966-
new: Add server
967-
serverPlaceholder: Server name
968-
title: Servers
969-
routerConfig:
970-
brandingUrlRoot: Branding URL Root
971-
carDropoffTime: Car Dropoff Time
972-
driveDistanceReluctance: Drive Distance Reluctance
973-
numItineraries: '# of itineraries'
974-
requestLogFile: Request log file
975-
stairsReluctance: Stairs Reluctance
976-
title: Router Config
977-
itineraryFilters:
978-
nonTransitGeneralizedCostLimit: Non-Transit Generalized Cost Limit
979-
updaters:
980-
$index:
981-
feedId: Feed ID
982-
frequencySec: Frequency (in seconds)
983-
sourceType: Source type
984-
type: Type
985-
url: URL
986-
new: Add updater
987-
title: Real-time updaters
988-
placeholder: Updater name
989-
walkSpeed: Walk Speed
990-
title: Deployment
991-
project:
992-
cannotFetchFeeds: Cannot fetch feeds
993-
feeds: Feeds
994-
permissions: Permissions
995-
rename: Rename
996-
save: Save
997-
title: Settings
998894
ProjectSettingsForm:
999895
cancel: Cancel
1000896
confirmDelete: Are you sure you want to delete this project? This action cannot be undone and all feed sources and their versions will be permanently deleted.

‎i18n/german.yml

-97
Original file line numberDiff line numberDiff line change
@@ -136,46 +136,6 @@ components:
136136
danger: Gefahr!
137137
success: Erfolg!
138138
warning: Warnung!
139-
DeploymentSettings:
140-
boundsPlaceholder: min_lon, min_lat, max_lon, max_lat
141-
buildConfig:
142-
elevationBucket:
143-
accessKey: Zugangs-Schlüssel
144-
bucketName: S3 Bucket Name
145-
secretKey: Secret Key
146-
fares: Tarife
147-
fetchElevationUS: Höhenmodell abrufen
148-
save: Speichern
149-
stationTransfers: Umstiege
150-
subwayAccessTime: U-Bahn-Zugangszeiten
151-
title: Build-Konfiguration
152-
clear: Zurücksetzen
153-
manageServers: Deployment-Server verwalten
154-
osm:
155-
bounds: Selbst-definierte Extrakt-Grenzen
156-
custom: Benutze selbst-definierte Extrakt-Grenzen
157-
gtfs: Grenzen aus GTFS ableiten
158-
title: OSM-Extrakt
159-
routerConfig:
160-
brandingUrlRoot: Branding-URL Wurzel
161-
carDropoffTime: PKW-Rückgabe-Zeit
162-
numItineraries: '# of Reisevorschläge'
163-
requestLogFile: Log-Datei anfordern
164-
stairsReluctance: Treppen-Abneigung
165-
title: Router Konfiguration
166-
updaters:
167-
$index:
168-
defaultAgencyId: Standard-Betreiber ID
169-
frequencySec: Frequenz (in Sekunden)
170-
sourceType: Quellen-Typ
171-
type: Typ
172-
url: URL
173-
new: Aktualisierer hinzufügen
174-
placeholder: Aktualisierer-Name
175-
title: Echtzeit-Aktualisierungs-Updater
176-
walkSpeed: Geh-Geschwindigkeit
177-
save: Speichern
178-
title: Deployment
179139
DeploymentVersionsTable:
180140
dateRetrieved: Abrufdatum
181141
errorCount: Fehlerzahl
@@ -1014,63 +974,6 @@ components:
1014974
transitland: Sync von transit.land
1015975
url: Feed-Abruf URL
1016976
version: Version
1017-
ProjectSettings:
1018-
deployment:
1019-
buildConfig:
1020-
elevationBucket:
1021-
accessKey: Zugriffs-Schlüssel (access)
1022-
bucketName: S3 Bucket Name
1023-
secretKey: Geheim-Schlüssel (secret)
1024-
fares: Tarife
1025-
fetchElevationUS: Rufe Geländemodell ab
1026-
stationTransfers: Umstiege
1027-
subwayAccessTime: U-Bahn-Zugangszeiten
1028-
title: Build Konfiguration
1029-
osm:
1030-
bounds: Benutzerdefinierte Extraktions-Grenzen
1031-
custom: Benutzerdefinierte Extraktions-Grenzen verwenden
1032-
gtfs: Benutzerdefinierte Extraktions-Grenzen verwenden
1033-
title: OSM Extrakt
1034-
otpServers:
1035-
$index:
1036-
admin: Nur Admin-Zugriff?
1037-
delete: Entfernen
1038-
internalUrl: Interne URLs
1039-
name: Name
1040-
namePlaceholder: Produktion
1041-
publicUrl: Öffentliche URL
1042-
r5: R5 Server?
1043-
s3Bucket: S3 Bucket Name
1044-
targetGroupArn: Zielgruppen ARN
1045-
new: Server hinzufügen
1046-
serverPlaceholder: Server-Name
1047-
title: Server
1048-
routerConfig:
1049-
brandingUrlRoot: Branding-URL Wurzel
1050-
carDropoffTime: PKW-Abstell-Zeit
1051-
numItineraries: '# Reisevorschläge'
1052-
requestLogFile: Log-Datei anfordern
1053-
stairsReluctance: Treppen-Vermeidung
1054-
title: Router Konfiguration
1055-
updaters:
1056-
$index:
1057-
defaultAgencyId: Default Betreiber-ID
1058-
frequencySec: Frequenz (in Sekunden)
1059-
sourceType: Quellen-Typ
1060-
type: Typ
1061-
url: URL
1062-
new: Updater hinzufügen
1063-
placeholder: Updater-Name
1064-
title: Real-time Updater
1065-
walkSpeed: Lauf-Geschwindigkeit
1066-
title: Deployment
1067-
project:
1068-
cannotFetchFeeds: Feeds können nicht abgerufen werden
1069-
feeds: Feeds
1070-
permissions: Berechtigungen
1071-
rename: Umbennenen
1072-
save: Speichern
1073-
title: Einstellungen
1074977
ProjectSettingsForm:
1075978
cancel: Abbrechen
1076979
confirmDelete: Sind Sie sicher, dass Sie dieses Projekt löschen möchten? Diese

‎i18n/polish.yml

-97
Original file line numberDiff line numberDiff line change
@@ -139,46 +139,6 @@ components:
139139
danger: Uwaga!
140140
success: Sukces!
141141
warning: Ostrzeżenie!
142-
DeploymentSettings:
143-
boundsPlaceholder: min_lon, min_lat, max_lon, max_lat
144-
buildConfig:
145-
elevationBucket:
146-
accessKey: Access Key
147-
bucketName: S3 Bucket Name
148-
secretKey: Secret Key
149-
fares: Taryfy
150-
fetchElevationUS: Fetch Elevation
151-
save: Zapisz
152-
stationTransfers: Transfery na stacji
153-
subwayAccessTime: Godziny otwarcia metra
154-
title: Build Config
155-
clear: Wyczyść
156-
manageServers: Manage deployment servers
157-
osm:
158-
bounds: Custom Extract Bounds
159-
custom: Use Custom Extract Bounds
160-
gtfs: Use GTFS-Derived Extract Bounds
161-
title: Wyciąg z OSM
162-
routerConfig:
163-
brandingUrlRoot: Branding URL Root
164-
carDropoffTime: Car Dropoff Time
165-
numItineraries: '# of itineraries'
166-
requestLogFile: Request log file
167-
stairsReluctance: Stairs Reluctance
168-
title: Router Config
169-
updaters:
170-
$index:
171-
defaultAgencyId: Domyślny ID przewoźnika
172-
frequencySec: Częstotliwość (w sekundach)
173-
sourceType: Rodzaj źródła
174-
type: Typ
175-
url: URL
176-
new: Add updater
177-
placeholder: Updater name
178-
title: Real-time updaters
179-
walkSpeed: Walk Speed
180-
save: Zapisz
181-
title: Wdrożenie
182142
DeploymentVersionsTable:
183143
dateRetrieved: Data pozyskania
184144
errorCount: Licznik błędów
@@ -1003,63 +963,6 @@ components:
1003963
transitland: Sync from transit.land
1004964
url: Feed download URL
1005965
version: version
1006-
ProjectSettings:
1007-
deployment:
1008-
buildConfig:
1009-
elevationBucket:
1010-
accessKey: Access Key
1011-
bucketName: S3 Bucket Name
1012-
secretKey: Secret Key
1013-
fares: Fares
1014-
fetchElevationUS: Fetch Elevation
1015-
stationTransfers: Sta. Transfers
1016-
subwayAccessTime: Subway Access Time
1017-
title: Build Config
1018-
osm:
1019-
bounds: Custom Extract Bounds
1020-
custom: Use Custom Extract Bounds
1021-
gtfs: Use GTFS-Derived Extract Bounds
1022-
title: OSM Extract
1023-
otpServers:
1024-
$index:
1025-
admin: Admin access only?
1026-
delete: Remove
1027-
internalUrl: Internal URLs
1028-
name: Name
1029-
namePlaceholder: Production
1030-
publicUrl: Public URL
1031-
r5: R5 Server?
1032-
s3Bucket: S3 bucket name
1033-
targetGroupArn: Target Group ARN
1034-
new: Add server
1035-
serverPlaceholder: Server name
1036-
title: Servers
1037-
routerConfig:
1038-
brandingUrlRoot: Branding URL Root
1039-
carDropoffTime: Car Dropoff Time
1040-
numItineraries: '# of itineraries'
1041-
requestLogFile: Request log file
1042-
stairsReluctance: Stairs Reluctance
1043-
title: Router Config
1044-
updaters:
1045-
$index:
1046-
defaultAgencyId: Default agency ID
1047-
frequencySec: Frequency (in seconds)
1048-
sourceType: Source type
1049-
type: Type
1050-
url: URL
1051-
new: Add updater
1052-
placeholder: Updater name
1053-
title: Real-time updaters
1054-
walkSpeed: Walk Speed
1055-
title: Deployment
1056-
project:
1057-
cannotFetchFeeds: Cannot fetch feeds
1058-
feeds: Feeds
1059-
permissions: Permissions
1060-
rename: Rename
1061-
save: Save
1062-
title: Settings
1063966
ProjectSettingsForm:
1064967
cancel: Cancel
1065968
confirmDelete: Are you sure you want to delete this project? This action cannot

0 commit comments

Comments
 (0)