Switched to Debian Image
This commit is contained in:
parent
9cc1ebdb30
commit
6501e4dab3
3 changed files with 11 additions and 10 deletions
17
Dockerfile
17
Dockerfile
|
@ -1,21 +1,22 @@
|
||||||
# https://www.lpalmieri.com/posts/fast-rust-docker-builds/
|
FROM rust:slim-bullseye AS base
|
||||||
FROM rust:alpine AS rust
|
RUN apt-get update
|
||||||
RUN apk add musl-dev openssl-dev
|
RUN apt-get install libssl-dev pkg-config -y
|
||||||
RUN cargo install cargo-chef
|
RUN cargo install cargo-chef
|
||||||
WORKDIR app
|
WORKDIR app
|
||||||
|
|
||||||
FROM rust AS planner
|
FROM base AS planner
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN cargo chef prepare --recipe-path recipe.json
|
RUN cargo chef prepare --recipe-path recipe.json
|
||||||
|
|
||||||
FROM rust AS builder
|
FROM base AS builder
|
||||||
COPY --from=planner /app/recipe.json recipe.json
|
COPY --from=planner /app/recipe.json recipe.json
|
||||||
RUN cargo chef cook --release --recipe-path recipe.json
|
RUN cargo chef cook --release --recipe-path recipe.json
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN cargo build --release --bin obsessed-yanqing
|
RUN cargo build --release --bin obsessed-yanqing
|
||||||
|
|
||||||
|
FROM rust:slim-bullseye
|
||||||
FROM alpine:latest
|
RUN apt-get update
|
||||||
RUN apk add --no-cache libc6-compat
|
RUN apt-get install ca-certificates -y
|
||||||
|
WORKDIR /root/
|
||||||
COPY --from=builder /app/target/release/obsessed-yanqing .
|
COPY --from=builder /app/target/release/obsessed-yanqing .
|
||||||
CMD ["./obsessed-yanqing"]
|
CMD ["./obsessed-yanqing"]
|
|
@ -239,7 +239,7 @@ pub async fn character(
|
||||||
#[description = "Character to Search"] user: String,
|
#[description = "Character to Search"] user: String,
|
||||||
) -> Result<(), Error> {
|
) -> Result<(), Error> {
|
||||||
match get_nearest_characters(user).await {
|
match get_nearest_characters(user).await {
|
||||||
None => { ctx.say(format!("Error occured")).await? }
|
None => { ctx.say(format!("Error occured, please see logs")).await? }
|
||||||
Some(characters) => {
|
Some(characters) => {
|
||||||
let handler = create_menu(ctx, characters).await;
|
let handler = create_menu(ctx, characters).await;
|
||||||
choice_interaction_handler(ctx, &handler).await;
|
choice_interaction_handler(ctx, &handler).await;
|
||||||
|
|
|
@ -31,7 +31,7 @@ pub struct Characters {
|
||||||
impl PrydwenCompatible for PrydwenAllCharacters{}
|
impl PrydwenCompatible for PrydwenAllCharacters{}
|
||||||
|
|
||||||
pub async fn get_nearest_characters(name: String) -> Option<Vec<Characters>> {
|
pub async fn get_nearest_characters(name: String) -> Option<Vec<Characters>> {
|
||||||
let mut characters = get_all_characters().await?;
|
let mut characters = get_all_characters().await.expect("Cannot get characters");
|
||||||
characters.nodes.sort_by(|a, b | {
|
characters.nodes.sort_by(|a, b | {
|
||||||
match a.name.to_lowercase().contains(name.to_lowercase().as_str()) {
|
match a.name.to_lowercase().contains(name.to_lowercase().as_str()) {
|
||||||
true => {
|
true => {
|
||||||
|
|
Loading…
Reference in a new issue