Pass through AWS_SECRET_ACCESS_KEY

Merge pull request 'Move elasticsearch into separate compose file' (#33 ) from change/es-compose into main
Reviewed-on: #33 Reviewed-by: ammaratef45 <ammaratef45@proton.me>
2026-01-07 23:05:38 +00:00 · 2026-01-04 22:18:59 +00:00 · 2026-01-04 11:09:41 +00:00 · 2026-01-04 10:58:29 +00:00 · 2026-01-03 11:04:09 +00:00 · 2026-01-02 21:55:27 +00:00
6 changed files with 40 additions and 22 deletions
--- a/.env.sample
+++ b/.env.sample
@ -67,9 +67,7 @@ REDIS_PORT=6379

 # ElasticSearch
 # --------------------------------------
-ES_ENABLED=true
-ES_HOST=es
-ES_PORT=9200
+# COMPOSE_FILE="$COMPOSE_FILE:compose.elasticsearch.yml"

 # StatsD (CURRENTLY NOT SUPPORTED)
 # -------------------------------
--- a/abra.sh
+++ b/abra.sh
@ -1,5 +1,5 @@
-export ENTRYPOINT_CONF_VERSION=v6
-export ENTRYPOINT_STREAMING_CONF_VERSION=v1
+export ENTRYPOINT_CONF_VERSION=v7
+export ENTRYPOINT_STREAMING_CONF_VERSION=v2

 grep=grep
 if ! $grep -P --version 2>/dev/null 1>/dev/null
@ -40,6 +40,7 @@ environment() {
    file_env "OTP_SECRET"
    file_env "SECRET_KEY_BASE"
    file_env "VAPID_PRIVATE_KEY"
+    file_env "AWS_SECRET_ACCESS_KEY"
    file_env "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY"
    file_env "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT"
    file_env "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY"
--- a/compose.elasticsearch.yml
+++ b/compose.elasticsearch.yml
@ -0,0 +1,34 @@
+---
+version: "3.8"
+
+services:
+  es:
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
+    environment:
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - "cluster.name=es-mastodon"
+      - "discovery.type=single-node"
+      - "bootstrap.memory_lock=true"
+    networks:
+      - internal
+    volumes:
+      - es:/usr/share/elasticsearch/data
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+
+  app:
+    environment: &es-env
+      - "ES_ENABLED=true"
+      - "ES_HOST=es"
+      - "ES_PORT=9200"
+
+  streaming:
+    environment: *es-env
+
+  sidekiq:
+    environment: *es-env
+
+volumes:
+  es:
--- a/compose.yml
+++ b/compose.yml
@ -185,22 +185,6 @@ services:
    volumes:
      - redis:/data

-  es:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
-    environment:
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-      - "cluster.name=es-mastodon"
-      - "discovery.type=single-node"
-      - "bootstrap.memory_lock=true"
-    networks:
-      - internal
-    volumes:
-      - es:/usr/share/elasticsearch/data
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-
 secrets:
  secret_key_base:
    name: ${STACK_NAME}_secret_key_base_${SECRET_SECRET_KEY_BASE_VERSION}
@ -231,7 +215,6 @@ volumes:
  app:
  redis:
  postgres:
-  es:

 networks:
  internal:
--- a/entrypoint-streaming.sh.tmpl
+++ b/entrypoint-streaming.sh.tmpl
@ -27,6 +27,7 @@ file_env "DB_PASS"
 file_env "OTP_SECRET"
 file_env "SECRET_KEY_BASE"
 file_env "VAPID_PRIVATE_KEY"
+file_env "AWS_SECRET_ACCESS_KEY"
 file_env "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY"
 file_env "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT"
 file_env "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY"
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@ -28,6 +28,7 @@ file_env "SMTP_PASSWORD"
 file_env "OTP_SECRET"
 file_env "SECRET_KEY_BASE"
 file_env "VAPID_PRIVATE_KEY"
+file_env "AWS_SECRET_ACCESS_KEY"
 file_env "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY"
 file_env "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT"
 file_env "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY"
Author	SHA1	Message	Date
Nick Sellen	5b2d3845db	Pass through AWS_SECRET_ACCESS_KEY Some checks failed continuous-integration/drone/pr Build is failing Details	2026-01-07 23:05:38 +00:00
ammaratef45	9d5927f60a	Merge pull request 'Move elasticsearch into separate compose file' (#33 ) from change/es-compose into main Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #33 Reviewed-by: ammaratef45 <ammaratef45@proton.me>	2026-01-04 22:18:59 +00:00
Nick Sellen	faf931a91a	Set ES_* vars to fixed values Some checks failed continuous-integration/drone/pr Build is failing Details	2026-01-04 11:09:41 +00:00
Nick Sellen	f4f105aea6	Remove elasticsearch from compose.yml	2026-01-04 10:58:29 +00:00
Nick Sellen	a8cf0fd940	Move elasticsearch into separate compose file Some checks failed continuous-integration/drone/pr Build is failing Details	2026-01-03 11:04:09 +00:00
nicksellen	7f1ba44869	Merge pull request 'Add s3 configuration options' (#32 ) from add/s3 into main Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #32	2026-01-02 21:55:27 +00:00