From 7c8a4374d1c92eb26169b5c9846f89f9fe9ce24d Mon Sep 17 00:00:00 2001
From: tkt <37575408+tktcorporation@users.noreply.github.com>
Date: Wed, 27 Sep 2023 15:07:31 +0000
Subject: [PATCH 1/2] :technologist: update docker image and fix path structure

---
 .github/dependabot.yml              | 8 ++++----
 .github/workflows/heroku-deploy.yml | 2 +-
 docker-compose.yml                  | 6 +++++-
 Dockerfile => docker/Dockerfile     | 0
 docker/Dockerfile.music             | 6 ++++--
 5 files changed, 14 insertions(+), 8 deletions(-)
 rename Dockerfile => docker/Dockerfile (100%)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0129762..b64481e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,16 +8,16 @@ updates:
   - package-ecosystem: "cargo" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "daily"
+      interval: "weekly"
     assignees:
       - "tktcorporation"
     commit-message:
       prefix: ":arrow_up:"
 
   - package-ecosystem: "docker"
-    directory: "/"
+    directory: "/docker/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     assignees:
       - "tktcorporation"
     commit-message:
@@ -26,7 +26,7 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     assignees:
       - "tktcorporation"
     commit-message:
diff --git a/.github/workflows/heroku-deploy.yml b/.github/workflows/heroku-deploy.yml
index d0ac4eb..8f6cc40 100644
--- a/.github/workflows/heroku-deploy.yml
+++ b/.github/workflows/heroku-deploy.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Build and push
         env:
           HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
-        run: heroku container:push -a ${{ secrets.HEROKU_APP_NAME }} app
+        run: cd ./docker && heroku container:push -a ${{ secrets.HEROKU_APP_NAME }} app --context-path ../
 
       - name: Release
         env:
diff --git a/docker-compose.yml b/docker-compose.yml
index dae6f31..66e82e9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,9 +3,11 @@ services:
   app:
     build:
       context: .
-      dockerfile: ./Dockerfile
+      dockerfile: ./docker/Dockerfile
       target: dev-env
     working_dir: /workspace
+    # sleep
+    command: bash -c "while true; do sleep 1; done"
     environment:
       - USER=$USER
       - DISCORD_TOKEN=$DISCORD_TOKEN
@@ -18,6 +20,8 @@ services:
     volumes:
       - .:/workspace:cached
       - /var/run/docker.sock:/var/run/docker.sock:rw
+      # rust
+      - cargo-cache:/usr/local/cargo/registry:cached
     tty: true
   heroku:
     # run `apk add docker` before running heroku commands
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from Dockerfile
rename to docker/Dockerfile
diff --git a/docker/Dockerfile.music b/docker/Dockerfile.music
index 6dd031c..14914eb 100644
--- a/docker/Dockerfile.music
+++ b/docker/Dockerfile.music
@@ -1,4 +1,4 @@
-FROM rust:1.64-slim-bullseye AS build-env
+FROM rust:1.72.1-slim-bullseye AS dev-env
 
 RUN apt-get update && \
     apt-get install -y \
@@ -23,6 +23,8 @@ RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o
 
 ENV LC_ALL=C.UTF-8
 
+FROM dev-env AS build-env
+
 COPY Cargo.lock Cargo.lock
 COPY Cargo.toml Cargo.toml
 
@@ -37,7 +39,7 @@ RUN cargo build --release --no-default-features --features "music"
 
 CMD [ "/bin/sh",  "-c", "cargo run" ]
 
-FROM debian:bullseye-20220418-slim
+FROM debian:bullseye-20230919-slim
 
 RUN apt-get update && \
     apt-get install -y \

From 03cdca148f9eeb331ed75a6c02368ce227136039 Mon Sep 17 00:00:00 2001
From: tkt <37575408+tktcorporation@users.noreply.github.com>
Date: Wed, 27 Sep 2023 15:10:43 +0000
Subject: [PATCH 2/2] :bookmark: v1.3.1

---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6b165dd..ce5945c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -508,7 +508,7 @@ dependencies = [
 
 [[package]]
 name = "discord-tts-bot"
-version = "1.3.0"
+version = "1.3.1"
 dependencies = [
  "aws-sdk-polly",
  "aws-types",
diff --git a/Cargo.toml b/Cargo.toml
index 3c448b7..e3981b8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "discord-tts-bot"
-version = "1.3.0"
+version = "1.3.1"
 authors = ["tktcorporation"]
 edition = "2021"
 license = "MIT"