diff --git a/Cargo.lock b/Cargo.lock index 03f21f499..f6fb5920b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -793,6 +793,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async_zip", + "aws-config", "aws-sdk-s3", "axum 0.7.5", "bytes", diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index 073b9b2f5..ddd2b9fdd 100644 --- 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 index 4c81662f3..398b52eb1 100644 --- 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 new file mode 100644 index 000000000..6f14058b2 --- /dev/null +++ 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 index b9b3af819..057bb97fe 100644 --- 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 index b0d63b374..4e7832f1a 100644 --- 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 index d2e269455..d237cdfb1 100644 --- 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