chore: install cert

AppFlowy-IO · Oct 3, 2024 · f83e698 · f83e698
1 parent c9d0c17
commit f83e698
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
@@ -163,6 +163,8 @@ services:
     build:
       context: .
       dockerfile: ./services/appflowy-worker/Dockerfile
+    ports:
+      - "4001:4001"
     environment:
       - RUST_LOG=${RUST_LOG:-info}
       - APPFLOWY_WORKER_REDIS_URL=redis://redis:6379

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -160,6 +160,7 @@ services:
       dockerfile: ./services/appflowy-worker/Dockerfile
     environment:
       - RUST_LOG=${RUST_LOG:-info}
+      - APPFLOWY_ENVIRONMENT=production
       - APPFLOWY_WORKER_REDIS_URL=redis://redis:6379
       - APPFLOWY_WORKER_ENVIRONMENT=production
       - APPFLOWY_WORKER_DATABASE_URL=${APPFLOWY_WORKER_DATABASE_URL}
@@ -169,7 +170,6 @@ services:
       - APPFLOWY_S3_SECRET_KEY=${APPFLOWY_S3_SECRET_KEY}
       - APPFLOWY_S3_BUCKET=${APPFLOWY_S3_BUCKET}
       - APPFLOWY_S3_REGION=${APPFLOWY_S3_REGION}
-
 volumes:
   postgres_data:
   minio_data:
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.77.2"
diff --git a/services/appflowy-worker/Cargo.toml b/services/appflowy-worker/Cargo.toml
@@ -36,9 +36,10 @@ infra.workspace = true
 sqlx = { workspace = true, default-features = false, features = ["runtime-tokio-rustls", "macros", "postgres", "uuid", "chrono", "migrate"] }
 secrecy = { version = "0.8", features = ["serde"] }
 aws-sdk-s3 = { version = "1.36.0", features = [
-    "behavior-version-latest",
-    "rt-tokio",
+  "behavior-version-latest",
+  "rt-tokio",
 ] }
+aws-config = { version = "1.5.1", features = ["behavior-version-latest"] }
 tokio-util = { version = "0.7.12", features = ["compat"] }
 async_zip = { version = "0.0.17", features = ["full"] }
 mime_guess = "2.0"

diff --git a/services/appflowy-worker/Dockerfile b/services/appflowy-worker/Dockerfile
@@ -28,6 +28,7 @@ FROM debian:bookworm-slim AS runtime
 WORKDIR /app/services/appflowy-worker
 RUN apt-get update -y \
     && apt-get install -y --no-install-recommends openssl \
+    && apt-get install -y -y ca-certificates \
     # Clean up
     && apt-get autoremove -y \
     && apt-get clean -y \

diff --git a/services/appflowy-worker/src/application.rs b/services/appflowy-worker/src/application.rs
@@ -142,7 +142,7 @@ pub async fn get_aws_s3_client(s3_setting: &S3Setting) -> Result<S3ClientImpl, E
     s3_setting.secret_key.expose_secret().clone(),
     None,
     None,
-    "custom",
+    "appflowy-worker",
   );
   let shared_credentials = SharedCredentialsProvider::new(credentials);