Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ PLACE_EDGE_TAG=$PLACEOS_TAG
PLACE_FRONTEND_LOADER_TAG=$PLACEOS_TAG
PLACE_INIT_TAG=$PLACEOS_TAG
PLACE_REST_API_TAG=$PLACEOS_TAG
PLACE_SEARCH_INGEST_TAG=$PLACEOS_TAG
PLACE_SOURCE_TAG=$PLACEOS_TAG
PLACE_TRIGGERS_TAG=$PLACEOS_TAG
PLACE_STAFF_API_TAG=$PLACEOS_TAG
Expand All @@ -32,7 +31,6 @@ PLACE_EDGE_REGISTRY=$CONTAINER_REGISTRY
PLACE_FRONTEND_LOADER_REGISTRY=$CONTAINER_REGISTRY
PLACE_INIT_REGISTRY=$CONTAINER_REGISTRY
PLACE_REST_API_REGISTRY=$CONTAINER_REGISTRY
PLACE_SEARCH_INGEST_REGISTRY=$CONTAINER_REGISTRY
PLACE_SOURCE_REGISTRY=$CONTAINER_REGISTRY
PLACE_TRIGGERS_REGISTRY=$CONTAINER_REGISTRY
PLACE_STAFF_API_REGISTRY=$CONTAINER_REGISTRY
Expand All @@ -48,7 +46,6 @@ PLACE_NGINX_REGISTRY=$CONTAINER_REGISTRY

PLACE_AUTH_HOST=auth:8080
PLACE_LOADER_URI=http://frontend-loader:3000
PLACE_SEARCH_INGEST_URI=http://search-ingest:3000

# PLACE_EMAIL=support@place.tech
# PLACE_USERNAME="Place Support (localhost:8443)"
Expand All @@ -59,9 +56,6 @@ PLACE_METRICS_ROUTE=monitor

# Infrastructure Variables

ELASTIC_HOST=elastic
ELASTIC_PORT=9200
ELASTIC_VERSION=7.17.6

REDIS_URL=redis://redis:6379

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ These will need to be installed prior to installation:
### MacOS

If using [Docker Desktop for Mac](https://docs.docker.com/desktop/mac/install/), the default memory allocation of 2GB is insufficient for
running Elasticsearch in addition to the set of PlaceOS services.
running the full set of PlaceOS services.
Bumping the resource limit to 4GB should be sufficient.

## Configuration
Expand Down
61 changes: 2 additions & 59 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ networks:
- subnet: 172.31.231.0/24

volumes:
elastic-data:
influx-data:
nginx-data:
postgres-data:
Expand Down Expand Up @@ -51,12 +50,6 @@ x-jwt-public-key-env: &jwt-public-key-env .env.public_key

x-secret-key-env: &secret-key-env .env.secret_key

x-elastic-client-env: &elastic-client-env
ELASTIC_HOST: ${ELASTIC_HOST:-elastic}
ELASTIC_PORT: ${ELASTIC_PORT:-9200}
ES_HOST: ${ELASTIC_HOST:-elastic}
ES_PORT: ${ELASTIC_PORT:-9200}

x-influxdb-api-key: &influxdb-api-key .env.influxdb

x-influxdb-client-env: &influxdb-client-env
Expand Down Expand Up @@ -84,12 +77,6 @@ x-postgresdb-client-env: &postgresdb-client-env
PG_DATABASE: ${PG_DB:-placeos}
PG_DATABASE_URL: ${PG_DATABASE_URL:-postgresql://placeos:development@postgres:5432/placeos}

x-search-ingest-client-env: &search-ingest-client-env
PLACE_SEARCH_INGEST_URI: ${PLACE_SEARCH_INGEST_URI:-http://search-ingest:3000}
RUBBER_SOUL_URI: ${RUBBER_SOUL_URI:-http://rubber-soul:3000}

x-search-ingest-service: &search-ingest-service ${PLACE_SEARCH_INGEST_IMAGE:-search-ingest}

x-smtp-client-env: &smtp-client-env
SMTP_SERVER: ${SMTP_SERVER:-}
SMTP_PORT: ${SMTP_PORT:-587}
Expand Down Expand Up @@ -118,15 +105,13 @@ services:
<<: [*std-network,*std-logging, *cap-drop]
depends_on:
- auth
- elastic
- redis
- postgres
- search-ingest
env_file:
- *jwt-public-key-env
- *secret-key-env
environment:
<<: [*deployment-env,*opentelemetry-env,*elastic-client-env,*place-loader-client-env,*redis-client-env,*postgresdb-client-env,*search-ingest-client-env]
<<: [*deployment-env,*opentelemetry-env,*place-loader-client-env,*redis-client-env,*postgresdb-client-env]
deploy:
resources:
limits:
Expand Down Expand Up @@ -292,11 +277,10 @@ services:
depends_on:
postgres:
condition: service_healthy
#- search-ingest
env_file:
- *secret-key-env
environment:
<<: [*deployment-env,*opentelemetry-env,*postgresdb-client-env,*elastic-client-env]
<<: [*deployment-env,*opentelemetry-env,*postgresdb-client-env]
# User/Application Configuration
PLACE_DOMAIN: ${PLACE_DOMAIN:-localhost:8443}
PLACE_APPLICATION: ${PLACE_APPLICATION:-backoffice}
Expand All @@ -306,24 +290,6 @@ services:
PLACE_PASSWORD: ${PLACE_PASSWORD:-development}
PLACE_TLS: "${PLACE_TLS:-true}"

search-ingest: # PostgreSQL to Elasticsearch Service
image: ${PLACE_SEARCH_INGEST_REGISTRY:-docker.io}/placeos/${PLACE_SEARCH_INGEST_IMAGE:-search-ingest}:${PLACE_SEARCH_INGEST_TAG:-latest}
restart: always
container_name: *search-ingest-service
hostname: *search-ingest-service
<<: [*std-network,*std-logging,*cap-drop]
depends_on:
elastic:
condition: service_healthy
postgres:
condition: service_healthy
environment:
<<: [*deployment-env,*opentelemetry-env,*postgresdb-client-env,*elastic-client-env]
deploy:
resources:
limits:
memory: "250m"

dispatch: # Engine driver server registration and data routing
image: ${PLACE_DISPATCH_REGISTRY:-docker.io}/placeos/dispatch:${PLACE_DISPATCH_TAG:-latest}
restart: always
Expand Down Expand Up @@ -365,29 +331,6 @@ services:
limits:
memory: "4g"

elastic:
image: elasticsearch:${ELASTIC_VERSION:-8.14.3}
restart: always
container_name: elastic
hostname: elastic
healthcheck:
test: curl --silent --fail localhost:9200/_cat/health
start_period: 1m
<<: [*std-network,*std-logging]
volumes:
- type: volume
source: elastic-data
target: /usr/share/elasticsearch/data
environment:
bootstrap.memory_lock: "true"
cluster.routing.allocation.disk.threshold_enabled: "false"
discovery.type: single-node
TZ: $TZ
deploy:
resources:
limits:
memory: "2g"

influxdb:
image: influxdb:${INFLUXDB_IMAGE_TAG:-2.0.8-alpine}
profiles:
Expand Down
Binary file modified images/service-graph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions placeos
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,6 @@ hard_reset() (
"Dropping PostgreSQL tables..." \
"Failed to drop PostgreSQL tables."

run_or_abort \
"${base_path}/scripts/run-sam-task drop:elastic" \
"Dropping Elasticsearch indices..." \
"Failed to drop Elasticsearch indices."

run_or_abort \
"docker compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' restart nginx" \
"Restarting nginx..." \
Expand Down