Merge pull request #373 from tktcorporation/fix/0

🧑‍💻 update docker image and fix path structure

.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:

.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:

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"

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

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 \