From c063b7e085ac95aa2499010862e28ab7aaaed07f Mon Sep 17 00:00:00 2001 From: Kareem <28524112+karyeet@users.noreply.github.com> Date: Sat, 29 Mar 2025 20:46:24 -0700 Subject: [PATCH 1/3] dockerfile --- Dockerfile | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..f645b894 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +FROM alpine:3.21.3 AS builder + +COPY . /Oxicloud + +WORKDIR /Oxicloud + +RUN apk update && \ + apk add cargo pkgconfig openssl-dev + +RUN cargo build --release + +# /Oxicloud/target/release/oxicloud + +FROM alpine:3.21.3 + +COPY . /Oxicloud + +COPY --from=builder /Oxicloud/target/release/ /Oxicloud +COPY --from=builder /usr/lib/libgcc_s.so.1 /usr/lib/libgcc_s.so.1 + +WORKDIR /Oxicloud + +CMD ["./oxicloud","--release"] \ No newline at end of file From ef19b935ec115cc1256db580f2ecdb5fe70f3c3f Mon Sep 17 00:00:00 2001 From: Kareem <28524112+karyeet@users.noreply.github.com> Date: Sun, 30 Mar 2025 00:13:32 -0700 Subject: [PATCH 2/3] add image to compose --- docker-compose.yml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1ea3becc..14f5070d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,8 +6,10 @@ services: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres POSTGRES_DB: oxicloud - ports: - - "5432:5432" +# ports: +# - "5432:5432" + networks: + - oxicloud volumes: - pg_data:/var/lib/postgresql/data - ./db/schema.sql:/docker-entrypoint-initdb.d/10-schema.sql @@ -16,6 +18,26 @@ services: interval: 5s timeout: 5s retries: 5 + + oxicloud: + image: oxicloud + restart: always + build: + context: . + dockerfile: Dockerfile + ports: + - "8086:8086" + - "8085:8085" + networks: + - oxicloud + depends_on: + - postgres + environment: + - "OXICLOUD_DB_CONNECTION_STRING=postgres://postgres:postgres@postgres/oxicloud" + +networks: + oxicloud: + driver: bridge volumes: pg_data: From 73d69ad7b6ad98b56494aa4ca01835d7bd5ad43b Mon Sep 17 00:00:00 2001 From: Kareem <28524112+karyeet@users.noreply.github.com> Date: Sun, 30 Mar 2025 00:13:49 -0700 Subject: [PATCH 3/3] server must bind to all interfaces --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index bed4763f..44f57dfe 100644 --- a/src/main.rs +++ b/src/main.rs @@ -678,7 +678,7 @@ async fn main() -> Result<(), Box> { } // Start server with clear message - let addr = SocketAddr::from(([127, 0, 0, 1], 8086)); + let addr = SocketAddr::from(([0, 0, 0, 0], 8086)); tracing::info!("Starting OxiCloud server on http://{}", addr); // Start the server