cupcakearmy/cryptgeon
1
0
Fork 0
mirror of https://github.com/cupcakearmy/cryptgeon.git synced 2024-12-23 08:46:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge f8c17487bd into f790438104

Browse Source
This commit is contained in:
Matthieu Guegan 2024-06-17 09:38:28 +02:00 committed by GitHub
commit 0cac07e97a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -15,13 +15,13 @@ FROM rust:1.76-alpine as backend
WORKDIR /tmp WORKDIR /tmp
RUN apk add --no-cache libc-dev openssl-dev alpine-sdk RUN apk add --no-cache libc-dev openssl-dev alpine-sdk
COPY ./packages/backend ./ COPY ./packages/backend ./
RUN cargo build --release RUN RUSTFLAGS="-Ctarget-feature=-crt-static" cargo build --release
# RUNNER # RUNNER
FROM alpine:3.19 FROM alpine:3.19
WORKDIR /app WORKDIR /app
RUN apk add --no-cache curl RUN apk add --no-cache curl libgcc
COPY --from=backend /tmp/target/release/cryptgeon . COPY --from=backend /tmp/target/release/cryptgeon .
COPY --from=client /tmp/packages/frontend/build ./frontend COPY --from=client /tmp/packages/frontend/build ./frontend
ENV FRONTEND_PATH="./frontend" ENV FRONTEND_PATH="./frontend"

2
packages/backend/Cargo.toml
View File

@ -22,4 +22,4 @@ dotenv = "0.15"
mime = "0.3" mime = "0.3"
env_logger = "0.9" env_logger = "0.9"
log = "0.4" log = "0.4"
redis = "0.23" redis = { version = "0.25.2", features = ["tls-native-tls"] }

2
packages/backend/src/store.rs
View File

@ -36,7 +36,7 @@ pub fn set(id: &String, note: &Note) -> Result<(), &'static str> {
match note.expiration { match note.expiration {
Some(e) => { Some(e) => {
let seconds = e - now(); let seconds = e - now();
conn.expire(id, seconds as usize) conn.expire(id, seconds as i64)
.map_err(|_| "Unable to set expiration on notion")? .map_err(|_| "Unable to set expiration on notion")?
} }
None => {} None => {}