diff --git a/.gitignore b/.gitignore index a777481..6a2e95c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /target -/token +/token \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..ee8f222 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM denoland/deno:debian +RUN mkdir /app + +WORKDIR /app + +COPY . ./ + +RUN chmod +x ./run.sh +RUN chmod +x ./src/bot.ts + +ENTRYPOINT [ "./run.sh" ] diff --git a/docker.sh b/docker.sh new file mode 100755 index 0000000..1fb4402 --- /dev/null +++ b/docker.sh @@ -0,0 +1,5 @@ +#!/bin/bash +docker stop ruche-manager +docker remove ruche-manager +docker build . --tag ruche-manager/ruche-manager:latest +docker run -d --name ruche-manager --restart unless-stopped ruche-manager/ruche-manager:latest diff --git a/modules.conf b/modules.conf index 19026c8..6a22e9e 100644 --- a/modules.conf +++ b/modules.conf @@ -12,5 +12,3 @@ Deploiment Dev à l'Échelle Programmation GPU PFEE -Éléments de Recherche Opé -Marque Personnelle diff --git a/packaging/docker/.gitignore b/packaging/docker/.gitignore deleted file mode 100644 index 35de6cf..0000000 --- a/packaging/docker/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/docker-ruche-manager.tgz diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile deleted file mode 100644 index 2a30447..0000000 --- a/packaging/docker/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM denoland/deno:1.46.1 - -USER deno - -COPY --from=project src /ruche-manager/src -COPY --from=project modules.conf /ruche-manager/modules.conf -WORKDIR /ruche-manager -RUN deno cache /ruche-manager/src/bot.ts - -ENTRYPOINT [ "/ruche-manager/src/bot.ts", "/token" ] diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh deleted file mode 100755 index 1d56eb3..0000000 --- a/packaging/docker/build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -e -cd "$(dirname "$(realpath "$0")")" - - -project_dir="$(dirname "$(dirname "$PWD")")" -tag="ruche-manager/ruche-manager:latest" - - -docker build --tag="$tag" --build-context=project="$project_dir" . -docker image save --output="docker-ruche-manager.tgz" "$tag" diff --git a/packaging/docker/run.sh b/packaging/docker/run.sh deleted file mode 100755 index 16f138e..0000000 --- a/packaging/docker/run.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -set -e -cd "$(dirname "$(realpath "$0")")" - - -project_dir="$(dirname "$(dirname "$PWD")")" -tag="ruche-manager/ruche-manager:latest" -name="ruche-manager" - - -if ! [ -f "$project_dir/token" ] -then echo "ERROR : Needs discord API token in '$project_dir/token'" && exit -fi - -docker remove --force "$name" -docker build --tag="$tag" --build-context=project="$project_dir" . -docker run \ - --volume="$project_dir/token:/token" \ - --volume="$project_dir/local:/ruche-manager/local" \ - --user="$(id -u):$(id -g)" \ - --restart="unless-stopped" \ - --name="$name" \ - --detach \ - "$tag" diff --git a/run.sh b/run.sh index 1a0cc0f..80ad14f 100755 --- a/run.sh +++ b/run.sh @@ -6,4 +6,4 @@ if ! [ -f ./token ] then echo "ERROR : Needs discord API token in ./token" && exit fi -DEBUG=871777993922588712 ./src/bot.ts ./token +DEBUG=871777993922588712 ./src/bot.ts ./token \ No newline at end of file