diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..edf5662 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +*/target* +data diff --git a/.env b/.env index e06907d..6ab6215 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -DATABASE_URL="sqlite:./sqlite.db?mode=rwc" -IMAGES_DIR="../images" -CORS_URL="http://localhost:8080" +DATABASE_URL="sqlite:/data/db/sqlite.db?mode=rwc" +IMAGES_DIR="/data/images" +CORS_URL="*" MEILI_URL="http://meili:7700" MEILI_KEY="asdasdasd" BACKEND_URL="http://localhost:8081" diff --git a/.gitignore b/.gitignore index 34cdbcf..a5c7dae 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ backend/target/ backend/sqlite.db dist/ images/* +data/* # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html # Cargo.lock diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b809738 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,17 @@ +FROM rust:alpine as builder + +RUN apk update +RUN apk add --no-cache openssl-dev musl-dev + +WORKDIR /usr/src/app +COPY . /usr/src/app + +RUN rustup target add wasm32-unknown-unknown +RUN cd frontend && cargo install trunk && trunk build --release +RUN cd backend && cargo build --release + +#FROM alpine:latest + +#WORKDIR /usr/src/app +#COPY --from=builder /usr/src/app/backend/target/x86_64-unknown-linux-musl/release/booksman /usr/src/app/booksman +#COPY --from=builder /usr/src/app/dist /usr/src/dist diff --git a/backend/api/src/lib.rs b/backend/api/src/lib.rs index eb72259..817c3c0 100644 --- a/backend/api/src/lib.rs +++ b/backend/api/src/lib.rs @@ -300,7 +300,7 @@ async fn create_by_isbn( } let mut goodread_id = "".to_string(); if !bookfound.unwrap().identifiers.is_none() { - let goodread_identifier = bookfound.clone().unwrap().identifiers.clone().unwrap().goodreads + let goodread_identifier = bookfound.clone().unwrap().identifiers.clone().unwrap().goodreads; if !goodread_identifier.is_none() { goodread_id = goodread_identifier.unwrap().get(0).unwrap().to_string() } diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..1a0ee74 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,23 @@ +version: '3' + +services: + booksman: + container_name: booksman + build: . + volumes: + - ./data/db:/data/db + - ./data/images:/data/images + expose: + - "8081" + depends_on: + - meilisearch + + meilisearch: + container_name: meilisearch + image: getmeili/meilisearch:v0.29 + volumes: + - ./data/meilisearch:/data.ms + expose: + - "7700" + environment: + - MEILI_MASTER_KEY=${MEILI_KEY}