From 7879062a82666d9e37e2cf23d06c20d50989366d Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sun, 10 Apr 2022 17:31:33 +0200
Subject: [PATCH] Fix missing qalc executable in container

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 Cargo.lock    |  2 +-
 Cargo.toml    |  2 +-
 Containerfile | 14 ++------------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 993d04d..7a02b75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2604,7 +2604,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tobi-rs"
-version = "0.9.11"
+version = "0.9.12"
 dependencies = [
  "animethemes-rs",
  "aspotify",
diff --git a/Cargo.toml b/Cargo.toml
index f83005c..598938c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ members=["bot-coreutils", "bot-database", "."]
 
 [package]
 name = "tobi-rs"
-version = "0.9.11"
+version = "0.9.12"
 authors = ["trivernis <trivernis@protonmail.com>"]
 edition = "2018"
 
diff --git a/Containerfile b/Containerfile
index 5baa03e..850235f 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,5 +1,4 @@
-ARG QALCULATE_VERSION=4.1.1
-ARG BASE_IMAGE=docker.io/alpine:latest
+ARG BASE_IMAGE=docker.io/alpine:edge
 
 FROM ${BASE_IMAGE} AS build_base
 RUN apk update
@@ -27,15 +26,6 @@ RUN cargo build --release --verbose
 RUN mkdir /tmp/tobi
 RUN cp target/release/tobi-rs /tmp/tobi/
 
-FROM build_base AS qalculate-builder
-ARG QALCULATE_VERSION
-RUN mkdir /tmp/qalculate
-WORKDIR /tmp/qalculate
-RUN apk add --no-cache wget xz ca-certificates
-RUN wget https://github.com/Qalculate/qalculate-gtk/releases/download/v${QALCULATE_VERSION}/qalculate-${QALCULATE_VERSION}-x86_64.tar.xz -O qalculate.tar.xz
-RUN tar xf qalculate.tar.xz
-RUN cp qalculate-${QALCULATE_VERSION}/* /tmp/qalculate
-
 FROM ${BASE_IMAGE} AS runtime-base
 RUN apk update
 RUN apk add --no-cache --force-overwrite \
@@ -44,11 +34,11 @@ RUN apk add --no-cache --force-overwrite \
     libpq \
     python3 \
     py3-pip \
+    qalc \
     bash
 RUN pip3 install youtube-dl
 RUN rm -rf /var/lib/{cache,log}/ /var/cache
 
 FROM runtime-base
-COPY --from=qalculate-builder /tmp/qalculate/* /usr/bin/
 COPY --from=builder /tmp/tobi/tobi-rs .
 ENTRYPOINT ["/tobi-rs"]
\ No newline at end of file