diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 2bb59c3..0000000 --- a/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM rust:slim as builder -RUN apt-get update && apt-get install -y libpq-dev libssl-dev pkg-config musl-tools perl make && rm -rf /var/lib/apt/lists/* -RUN rustup target add x86_64-unknown-linux-musl -WORKDIR /app -COPY . /app -RUN cargo build --release --target x86_64-unknown-linux-musl -RUN strip /app/target/x86_64-unknown-linux-musl/release/microservice - -FROM scratch -COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/microservice /microservice -WORKDIR / -CMD ["/microservice"] diff --git a/docker-compose.yml b/docker-compose.yml index 0e6d225..b91e10b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,4 +6,4 @@ services: - LISTEN=0.0.0.0:8080 ports: - 8080:8080 - image: ghcr.io/lysand-org/activitypub:latest + image: ghcr.io/lysand-org/activitypub:main diff --git a/src/main.rs b/src/main.rs index bee75c8..6b08c78 100644 --- a/src/main.rs +++ b/src/main.rs @@ -139,7 +139,8 @@ lazy_static! { static ref DATABASE_URL: String = env::var("DATABASE_URL").expect("DATABASE_URL must be set"); static ref USERNAME: String = env::var("LOCAL_USER_NAME").unwrap_or(LOCAL_USER_NAME.to_string()); - static ref DOMAIN: String = env::var("FEDERATED_DOMAIN").unwrap_or(DOMAIN_DEF.to_string()); + static ref API_DOMAIN: String = env::var("API_DOMAIN").unwrap_or(DOMAIN_DEF.to_string()); + static ref FEDERATED_DOMAIN: String = env::var("FEDERATED_DOMAIN").unwrap_or(DOMAIN_DEF.to_string()); } static DB: OnceLock = OnceLock::new(); @@ -155,12 +156,12 @@ async fn main() -> actix_web::Result<(), anyhow::Error> { let ap_id = Url::parse(&format!( "https://{}/{}", - DOMAIN.to_string(), + API_DOMAIN.to_string(), &USERNAME.to_string() ))?; let inbox = Url::parse(&format!( "https://{}/{}/inbox", - DOMAIN.to_string(), + API_DOMAIN.to_string(), &USERNAME.to_string() ))?; let keypair = generate_actor_keypair()?;