variphx commited on
Commit
eb8926a
·
1 Parent(s): 28f7fd8

too lazy to write messages

Browse files
Files changed (3) hide show
  1. Dockerfile +8 -6
  2. src/main.rs +1 -0
  3. src/models/states/mod.rs +1 -1
Dockerfile CHANGED
@@ -1,22 +1,24 @@
1
- FROM rust:alpine AS builder-cache
2
  WORKDIR /app/
3
 
4
- RUN apk add build-base openssl-dev curl
5
  COPY Cargo.toml Cargo.lock ./
6
  RUN mkdir -p src/ && echo "fn main() {}" > src/main.rs
7
  RUN cargo build --release
8
 
9
- FROM rust:alpine AS builder
10
  WORKDIR /app/
11
 
12
- COPY Cargo.toml Cargo.lock /app/
 
 
13
  COPY src/ /app/src/
14
  COPY --from=builder-cache /app/target/ /app/target/
15
  RUN cargo build --release
16
 
17
- FROM alpine:latest
18
- WORKDIR /app
19
 
 
20
  COPY --from=builder /app/target/release/aic-server /app/server
21
 
22
  EXPOSE 8080
 
1
+ FROM rust:1.89-bookworm AS builder-cache
2
  WORKDIR /app/
3
 
 
4
  COPY Cargo.toml Cargo.lock ./
5
  RUN mkdir -p src/ && echo "fn main() {}" > src/main.rs
6
  RUN cargo build --release
7
 
8
+ FROM rust:1.89-bookworm AS builder
9
  WORKDIR /app/
10
 
11
+ RUN apt-get update && apt-get -y install protobuf-compiler
12
+ COPY Cargo.toml Cargo.lock build.rs /app/
13
+ COPY proto/ /app/proto/
14
  COPY src/ /app/src/
15
  COPY --from=builder-cache /app/target/ /app/target/
16
  RUN cargo build --release
17
 
18
+ FROM debian:bookworm
19
+ WORKDIR /app/
20
 
21
+ RUN apt-get update && apt-get -y install libpq5
22
  COPY --from=builder /app/target/release/aic-server /app/server
23
 
24
  EXPOSE 8080
src/main.rs CHANGED
@@ -28,6 +28,7 @@ mod services;
28
 
29
  #[tokio::main]
30
  async fn main() -> anyhow::Result<()> {
 
31
  tracing_subscriber::registry()
32
  .with(
33
  tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
 
28
 
29
  #[tokio::main]
30
  async fn main() -> anyhow::Result<()> {
31
+ println!("test");
32
  tracing_subscriber::registry()
33
  .with(
34
  tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
src/models/states/mod.rs CHANGED
@@ -25,7 +25,7 @@ impl AppState {
25
 
26
  fn diesel_pool_helper() -> anyhow::Result<Pool> {
27
  Ok(Pool::builder(Manager::new(
28
- std::env::var("DATABASE_URL")?,
29
  Runtime::Tokio1,
30
  ))
31
  .build()?)
 
25
 
26
  fn diesel_pool_helper() -> anyhow::Result<Pool> {
27
  Ok(Pool::builder(Manager::new(
28
+ std::env::var("DATABASE_URL").expect("`DATABASE_URL` environment variable must be set"),
29
  Runtime::Tokio1,
30
  ))
31
  .build()?)