Skip to content
This repository was archived by the owner on Feb 24, 2021. It is now read-only.

Commit 005be45

Browse files
michaelestrinmichaelestrin
authoredDec 12, 2019
Remove Export Services for Geneva Release (#186)
Related to: edgexfoundry/edgex-go#2218 Signed-off-by: Michael W. Estrin <me@michaelestrin.com>
·
v1.3.1v1.3.0
1 parent 84d51f3 commit 005be45

11 files changed

+5
-155
lines changed
 

‎.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ docker-core-config-seed/
7575
docker-core-consul/
7676
docker-edgex-mongo/
7777
docker-edgex-volume/
78-
export-client/
79-
export-distro/
8078
export-domain/
8179
export-test/
8280
support-domain/

‎MODULES

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
#
1717
# Author: chencho
1818

19-
export MODULES=(core-data-client core-domain core-exception core-test export-distro export-domain export-test support-domain support-logging-client export-client support-notifications-client core-data core-metadata-client support-scheduler)
19+
export MODULES=(core-data-client core-domain core-exception core-test export-domain export-test support-domain support-logging-client support-notifications-client core-data core-metadata-client support-scheduler)
2020

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ This script will:
2929

3030
**prepare-environment.sh**, this script will clone the set of modules you need. You can pass a list of valid modules.
3131

32-
>MODULES: core-data-client core-domain core-exception core-test export-distro
33-
>export-domain export-test support-domain support-logging-client export-client
32+
>MODULES: core-data-client core-domain core-exception core-test
33+
>export-domain export-test support-domain support-logging-client
3434
>support-notifications-client core-data core-metadata-client
3535
3636
**Note**, if you run the script without parameters, you can manually choose which modules you want to be installed.

‎clean_mongo.js

-2
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,3 @@ db.auth('notifications','password');
4646
db.notification.remove({});
4747
db.subscription.remove({});
4848
db.transmission.remove({});
49-
db=db.getSiblingDB('exportclient')
50-
db.exportConfiguration.remove({});

‎create-containers.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
set -e
2020

2121
DOCKERS=( docker-edgex-volume docker-core-consul core-config-seed docker-edgex-mongo support-logging \
22-
support-notifications core-metadata core-data core-command support-scheduler export-client \
23-
export-distro support-rulesengine device-virtual device-bacnet device-bluetooth device-modbus device-mqtt device-snmp)
22+
support-notifications core-metadata core-data core-command support-scheduler \
23+
support-rulesengine device-virtual device-bacnet device-bluetooth device-modbus device-mqtt device-snmp)
2424

2525
DOCKERFILE=$1
2626

‎init_mongo.js

-10
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ db.serviceMapping.insert( { serviceName: "command", serviceUrl: "http://localhos
3232
db.serviceMapping.insert( { serviceName: "rules", serviceUrl: "http://localhost:48084/" });
3333
db.serviceMapping.insert( { serviceName: "notifications", serviceUrl: "http://localhost:48060/" });
3434
db.serviceMapping.insert( { serviceName: "logging", serviceUrl: "http://localhost:48061/" });
35-
db.serviceMapping.insert( { serviceName: "exportclient", serviceUrl: "http://localhost:48071/" });
3635

3736
db=db.getSiblingDB('admin')
3837
db.system.users.remove({});
@@ -126,12 +125,3 @@ db.createCollection("interval");
126125
db.createCollection("intervalAction");
127126
db.interval.createIndex({name: 1}, {unique: true});
128127
db.intervalAction.createIndex({name: 1}, {unique: true});
129-
130-
db=db.getSiblingDB('exportclient')
131-
db.createUser({ user: "exportclient",
132-
pwd: "password",
133-
roles: [
134-
{ role: "readWrite", db: "exportclient" }
135-
]
136-
});
137-
db.createCollection("exportConfiguration");

‎project-metrics/fetch_repos.sh

-4
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,10 @@ docker-device-virtual
2323
docker-edgex-mongo
2424
docker-edgex-mongo-seed
2525
docker-edgex-volume
26-
docker-export-client
27-
docker-export-distro
2826
docker-support-logging
2927
docker-support-notifications
3028
docker-support-rulesengine
3129
docker-support-scheduler
32-
export-client
33-
export-distro
3430
export-domain
3531
export-test
3632
edgex-ui-go

‎releases/nightly-build/compose-files/docker-compose-nexus-no-secty.yml

-42
Original file line numberDiff line numberDiff line change
@@ -227,48 +227,6 @@ services:
227227
depends_on:
228228
- app-service-rules
229229

230-
# export-client:
231-
# image: nexus3.edgexfoundry.org:10004/docker-export-client-go:master
232-
# ports:
233-
# - "48071:48071"
234-
# container_name: edgex-export-client
235-
# hostname: edgex-export-client
236-
# networks:
237-
# - edgex-network
238-
# environment:
239-
# <<: *common-variables
240-
# volumes:
241-
# - db-data:/data/db
242-
# - log-data:/edgex/logs
243-
# - consul-config:/consul/config
244-
# - consul-data:/consul/data
245-
# depends_on:
246-
# - data
247-
#
248-
# export-distro:
249-
# image: nexus3.edgexfoundry.org:10004/docker-export-distro-go:master
250-
# ports:
251-
# - "48070:48070"
252-
# - "5566:5566"
253-
# container_name: edgex-export-distro
254-
# hostname: edgex-export-distro
255-
# networks:
256-
# - edgex-network
257-
# volumes:
258-
# - db-data:/data/db
259-
# - log-data:/edgex/logs
260-
# - consul-config:/consul/config
261-
# - consul-data:/consul/data
262-
# depends_on:
263-
# - export-client
264-
# environment:
265-
# <<: *common-variables
266-
# EXPORT_DISTRO_CLIENT_HOST: export-client
267-
# EXPORT_DISTRO_DATA_HOST: edgex-core-data
268-
# EXPORT_DISTRO_CONSUL_HOST: dgex-config-seed
269-
# EXPORT_DISTRO_MQTTS_CERT_FILE: none
270-
# EXPORT_DISTRO_MQTTS_KEY_FILE: none
271-
272230
#################################################################
273231
# Device Services
274232
#################################################################

‎releases/nightly-build/compose-files/docker-compose-nexus-redis-no-secty.yml

-42
Original file line numberDiff line numberDiff line change
@@ -230,48 +230,6 @@ services:
230230
depends_on:
231231
- app-service-rules
232232

233-
# export-client:
234-
# image: nexus3.edgexfoundry.org:10004/docker-export-client-go:master
235-
# ports:
236-
# - "48071:48071"
237-
# container_name: edgex-export-client
238-
# hostname: edgex-export-client
239-
# networks:
240-
# - edgex-network
241-
# environment:
242-
# <<: *common-variables
243-
# volumes:
244-
# - db-data:/data/db
245-
# - log-data:/edgex/logs
246-
# - consul-config:/consul/config
247-
# - consul-data:/consul/data
248-
# depends_on:
249-
# - data
250-
#
251-
# export-distro:
252-
# image: nexus3.edgexfoundry.org:10004/docker-export-distro-go:master
253-
# ports:
254-
# - "48070:48070"
255-
# - "5566:5566"
256-
# container_name: edgex-export-distro
257-
# hostname: edgex-export-distro
258-
# networks:
259-
# - edgex-network
260-
# volumes:
261-
# - db-data:/data/db
262-
# - log-data:/edgex/logs
263-
# - consul-config:/consul/config
264-
# - consul-data:/consul/data
265-
# depends_on:
266-
# - export-client
267-
# environment:
268-
# <<: *common-variables
269-
# EXPORT_DISTRO_CLIENT_HOST: export-client
270-
# EXPORT_DISTRO_DATA_HOST: edgex-core-data
271-
# EXPORT_DISTRO_CONSUL_HOST: dgex-config-seed
272-
# EXPORT_DISTRO_MQTTS_CERT_FILE: none
273-
# EXPORT_DISTRO_MQTTS_KEY_FILE: none
274-
275233
#################################################################
276234
# Device Services
277235
#################################################################

‎releases/nightly-build/compose-files/docker-compose-nexus.yml

-44
Original file line numberDiff line numberDiff line change
@@ -405,50 +405,6 @@ services:
405405
depends_on:
406406
- app-service-rules
407407

408-
# export-client:
409-
# image: nexus3.edgexfoundry.org:10004/docker-export-client-go:master
410-
# ports:
411-
# - "48071:48071"
412-
# container_name: edgex-export-client
413-
# hostname: edgex-export-client
414-
# networks:
415-
# - edgex-network
416-
# environment:
417-
# <<: *common-variables
418-
# volumes:
419-
# - db-data:/data/db
420-
# - log-data:/edgex/logs
421-
# - consul-config:/consul/config
422-
# - consul-data:/consul/data
423-
# - vault-config:/vault/config
424-
# - /tmp/edgex/secrets/ca/ca.pem:/tmp/edgex/secrets/ca/ca.pem:ro
425-
# depends_on:
426-
# - data
427-
#
428-
# export-distro:
429-
# image: nexus3.edgexfoundry.org:10004/docker-export-distro-go:master
430-
# ports:
431-
# - "48070:48070"
432-
# - "5566:5566"
433-
# container_name: edgex-export-distro
434-
# hostname: edgex-export-distro
435-
# networks:
436-
# - edgex-network
437-
# volumes:
438-
# - db-data:/data/db
439-
# - log-data:/edgex/logs
440-
# - consul-config:/consul/config
441-
# - consul-data:/consul/data
442-
# depends_on:
443-
# - export-client
444-
# environment:
445-
# <<: *common-variables
446-
# EXPORT_DISTRO_CLIENT_HOST: export-client
447-
# EXPORT_DISTRO_DATA_HOST: edgex-core-data
448-
# EXPORT_DISTRO_CONSUL_HOST: dgex-config-seed
449-
# EXPORT_DISTRO_MQTTS_CERT_FILE: none
450-
# EXPORT_DISTRO_MQTTS_KEY_FILE: none
451-
452408
#################################################################
453409
# Device Services
454410
#################################################################

‎run-it.sh

-4
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ run_service command 48082
6868

6969
run_service scheduler 48085
7070

71-
run_service export-client 48071
72-
73-
run_service export-distro 48070
74-
7571
run_service rulesengine 48075
7672

7773
run_service device-virtual 49990

0 commit comments

Comments
 (0)
This repository has been archived.