From 073603e1fc9e556e217622c14265475bd2d24cf1 Mon Sep 17 00:00:00 2001 From: Elizabeth J Lee Date: Wed, 13 Sep 2023 14:49:08 -0700 Subject: [PATCH 01/16] refactor: clean up un-needed EdgeX services to reduce app size Signed-off-by: Elizabeth J Lee --- docker-compose-edgex.yml | 268 --------------------------------------- 1 file changed, 268 deletions(-) diff --git a/docker-compose-edgex.yml b/docker-compose-edgex.yml index d7e2bca..21defb1 100644 --- a/docker-compose-edgex.yml +++ b/docker-compose-edgex.yml @@ -1,31 +1,5 @@ name: edgex services: - app-rules-engine: - container_name: edgex-app-rules-engine - depends_on: - consul: - condition: service_started - core-data: - condition: service_started - environment: - EDGEX_PROFILE: rules-engine - EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-app-rules-engine - hostname: edgex-app-rules-engine - image: edgexfoundry/app-service-configurable:3.0.1 - networks: - edgex-network: null - ports: - - mode: ingress - host_ip: 127.0.0.1 - target: 59701 - published: "59701" - protocol: tcp - read_only: true - restart: always - security_opt: - - no-new-privileges:true - user: 2002:2001 consul: command: - agent @@ -59,34 +33,6 @@ services: source: consul-data target: /consul/data volume: {} - core-command: - container_name: edgex-core-command - depends_on: - consul: - condition: service_started - core-metadata: - condition: service_started - database: - condition: service_started - environment: - EDGEX_SECURITY_SECRET_STORE: "false" - EXTERNALMQTT_URL: tcp://edgex-mqtt-broker:1883 - SERVICE_HOST: edgex-core-command - hostname: edgex-core-command - image: edgexfoundry/core-command:3.0.0 - networks: - edgex-network: null - ports: - - mode: ingress - host_ip: 127.0.0.1 - target: 59882 - published: "59882" - protocol: tcp - read_only: true - restart: always - security_opt: - - no-new-privileges:true - user: 2002:2001 core-common-config-bootstrapper: container_name: edgex-core-common-config-bootstrapper depends_on: @@ -111,80 +57,6 @@ services: security_opt: - no-new-privileges:true user: 2002:2001 - core-data: - container_name: edgex-core-data - depends_on: - consul: - condition: service_started - core-metadata: - condition: service_started - database: - condition: service_started - environment: - EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-core-data - hostname: edgex-core-data - image: edgexfoundry/core-data:3.0.0 - networks: - edgex-network: null - ports: - - mode: ingress - host_ip: 127.0.0.1 - target: 59880 - published: "59880" - protocol: tcp - read_only: true - restart: always - security_opt: - - no-new-privileges:true - user: 2002:2001 - core-metadata: - container_name: edgex-core-metadata - depends_on: - consul: - condition: service_started - database: - condition: service_started - environment: - EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-core-metadata - hostname: edgex-core-metadata - image: edgexfoundry/core-metadata:3.0.0 - networks: - edgex-network: null - ports: - - mode: ingress - host_ip: 127.0.0.1 - target: 59881 - published: "59881" - protocol: tcp - read_only: true - restart: always - security_opt: - - no-new-privileges:true - user: 2002:2001 - database: - container_name: edgex-redis - hostname: edgex-redis - image: redis:7.0.11-alpine - networks: - edgex-network: null - ports: - - mode: ingress - host_ip: 127.0.0.1 - target: 6379 - published: "6379" - protocol: tcp - read_only: true - restart: always - security_opt: - - no-new-privileges:true - user: root:root - volumes: - - type: volume - source: db-data - target: /data - volume: {} mqtt-broker: command: - /usr/sbin/mosquitto @@ -206,136 +78,6 @@ services: security_opt: - no-new-privileges:true user: 2002:2001 - rules-engine: - container_name: edgex-kuiper - depends_on: - database: - condition: service_started - mqtt-broker: - condition: service_started - environment: - CONNECTION__EDGEX__MQTTMSGBUS__OPTIONAL__CLIENTID: kuiper-rules-engine - CONNECTION__EDGEX__MQTTMSGBUS__OPTIONAL__KEEPALIVE: "500" - CONNECTION__EDGEX__MQTTMSGBUS__PORT: "1883" - CONNECTION__EDGEX__MQTTMSGBUS__PROTOCOL: tcp - CONNECTION__EDGEX__MQTTMSGBUS__SERVER: edgex-mqtt-broker - CONNECTION__EDGEX__MQTTMSGBUS__TYPE: mqtt - CONNECTION__EDGEX__REDISMSGBUS__PORT: "6379" - CONNECTION__EDGEX__REDISMSGBUS__PROTOCOL: redis - CONNECTION__EDGEX__REDISMSGBUS__SERVER: edgex-redis - CONNECTION__EDGEX__REDISMSGBUS__TYPE: redis - EDGEX__DEFAULT__OPTIONAL__CLIENTID: kuiper-rules-engine - EDGEX__DEFAULT__OPTIONAL__KEEPALIVE: "500" - EDGEX__DEFAULT__PORT: "1883" - EDGEX__DEFAULT__PROTOCOL: tcp - EDGEX__DEFAULT__SERVER: edgex-mqtt-broker - EDGEX__DEFAULT__TOPIC: edgex/rules-events - EDGEX__DEFAULT__TYPE: mqtt - KUIPER__BASIC__CONSOLELOG: "true" - KUIPER__BASIC__RESTPORT: "59720" - hostname: edgex-kuiper - image: lfedge/ekuiper:1.9.2-alpine - networks: - edgex-network: null - ports: - - mode: ingress - host_ip: 127.0.0.1 - target: 59720 - published: "59720" - protocol: tcp - read_only: true - restart: always - security_opt: - - no-new-privileges:true - user: kuiper:kuiper - volumes: - - type: volume - source: kuiper-data - target: /kuiper/data - volume: {} - - type: volume - source: kuiper-etc - target: /kuiper/etc - volume: {} - - type: volume - source: kuiper-log - target: /kuiper/log - volume: {} - - type: volume - source: kuiper-plugins - target: /kuiper/plugins - volume: {} - support-notifications: - container_name: edgex-support-notifications - depends_on: - consul: - condition: service_started - database: - condition: service_started - environment: - EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-support-notifications - hostname: edgex-support-notifications - image: edgexfoundry/support-notifications:3.0.0 - networks: - edgex-network: null - ports: - - mode: ingress - host_ip: 127.0.0.1 - target: 59860 - published: "59860" - protocol: tcp - read_only: true - restart: always - security_opt: - - no-new-privileges:true - user: 2002:2001 - support-scheduler: - container_name: edgex-support-scheduler - depends_on: - consul: - condition: service_started - database: - condition: service_started - environment: - EDGEX_SECURITY_SECRET_STORE: "false" - INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data - INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data - SERVICE_HOST: edgex-support-scheduler - hostname: edgex-support-scheduler - image: edgexfoundry/support-scheduler:3.0.0 - networks: - edgex-network: null - ports: - - mode: ingress - host_ip: 127.0.0.1 - target: 59861 - published: "59861" - protocol: tcp - read_only: true - restart: always - security_opt: - - no-new-privileges:true - user: 2002:2001 - ui: - container_name: edgex-ui-go - environment: - EDGEX_SECURITY_SECRET_STORE: "false" - SERVICE_HOST: edgex-ui-go - hostname: edgex-ui-go - image: edgexfoundry/edgex-ui:3.0.0 - networks: - edgex-network: null - ports: - - mode: ingress - target: 4000 - published: "4000" - protocol: tcp - read_only: true - restart: always - security_opt: - - no-new-privileges:true - user: 2002:2001 networks: edgex-network: name: edgex_edgex-network @@ -345,13 +87,3 @@ volumes: name: edgex_consul-config consul-data: name: edgex_consul-data - db-data: - name: edgex_db-data - kuiper-data: - name: edgex_kuiper-data - kuiper-etc: - name: edgex_kuiper-etc - kuiper-log: - name: edgex_kuiper-log - kuiper-plugins: - name: edgex_kuiper-plugins From 7b35b49a3f6ede06297cc5bedc14fb07689ad4a8 Mon Sep 17 00:00:00 2001 From: ejlee-intel Date: Wed, 13 Sep 2023 17:04:41 -0700 Subject: [PATCH 02/16] fix: adjust github pages link and intel OS tech (#25) Signed-off-by: Elizabeth J Lee --- README.md | 2 +- docs/index.html | 2 +- docs/search/search_index.json | 2 +- docs/sitemap.xml.gz | Bin 195 -> 195 bytes docs_src/index.md | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0171111..c198b5c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # team-jedi-hackathon-dev NEX Jedi Team Hackathon Microservice project - Development Repo -For documentation, see the [GitHub Pages](https://github.io/intel-sandbox/team-jedi-hackathon/index.html). +For documentation, see the [GitHub Pages](https://neethues-intel.github.io/team-jedi-hackathon-dev/). ## Running Documentation Locally diff --git a/docs/index.html b/docs/index.html index 7c17fdc..093d756 100644 --- a/docs/index.html +++ b/docs/index.html @@ -261,7 +261,7 @@

OverviewTarget System Requirements