diff --git a/Dockerfile b/Dockerfile index 03b0b98..738462d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,10 @@ +# build image FROM rust:latest as build RUN rustup target add wasm32-unknown-unknown RUN cargo install trunk wasm-bindgen-cli -RUN apt-get update && apt-get install -y npm binaryen && npm install -g sass +RUN apt-get update && apt-get install -y npm binaryen libpq5 && npm install -g sass WORKDIR /app/src COPY . . @@ -11,11 +12,23 @@ COPY . . RUN cd frontend && trunk build --release RUN cargo build --release -FROM gcr.io/distroless/cc-debian10 + +# production image + +#FROM gcr.io/distroless/cc-debian10 +#COPY --from=build /usr/lib/*/libpq.so.5 /app/lib/ +#COPY --from=build /usr/lib/*/libgssapi_krb5.so.2 /app/lib/ +#COPY --from=build /usr/lib/*/libldap_r-2.4.so.2 /app/lib/ +#COPY --from=build /usr/lib/*/libkrb5.so.3 /app/lib/ +#COPY --from=build /usr/lib/*/libk5crypto.so.3 /app/lib/ +#COPY --from=build /usr/lib/*/libcom_err.* /app/lib/ +#ENV LD_LIBRARY_PATH=/app/lib/ + +FROM ubuntu:latest RUN apt-get update && apt-get install -y libpq5 COPY --from=build /app/src/target/release/backend /app/backend COPY --from=build /app/src/frontend/dist /app/dist WORKDIR /app -CMD ["./backend"] \ No newline at end of file +CMD ["./backend"] diff --git a/docker-compose.yml b/docker-compose.yml index 201debd..4d38ef3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,23 +4,30 @@ services: db: image: postgres - #restart: always + restart: always + volumes: + - ./data:/var/lib/postgresql/data ports: - 5432:5432 environment: - POSTGRES_USER: user - POSTGRES_PASSWORD: password + - POSTGRES_DB=diesel_demo + - POSTGRES_USER=user + - POSTGRES_PASSWORD=password adminer: image: adminer - #restart: always + restart: always ports: - 3000:8080 # photos: # build: . # environment: - # - DATABASE_URL="postgres://user:password@db/diesel_demo" + # - DATABASE_URL=postgres://user:password@db/diesel_demo + # restart: always # ports: # - 8081:8081 - + # depends_on: + # - db + # links: + # - db diff --git a/frontend/src/main.rs b/frontend/src/main.rs index 0ea9542..a020f47 100644 --- a/frontend/src/main.rs +++ b/frontend/src/main.rs @@ -63,7 +63,7 @@ impl Component for App { fn update(&mut self, msg: Self::Message) -> bool { match msg { Msg::GetPictures => { - let request = Request::get("http://localhost/api/pictures/") + let request = Request::get("/api/pictures/") .body(Nothing) .expect("Could not build that request"); let callback =