From 965f7d22422d95efd0b6ad11c1faf732e8ca75a7 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Thu, 10 Feb 2022 21:24:02 +0100 Subject: [PATCH 1/8] bump py-cord version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 70dba3b..ddb5d19 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -py-cord==2.0.0b3 \ No newline at end of file +py-cord==2.0.0b4 \ No newline at end of file From 74425995f76bb93dbbf86be81df981535be49b38 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Sun, 6 Mar 2022 04:08:40 +0000 Subject: [PATCH 2/8] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..37f9f5d --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,31 @@ +stages: # List of stages for jobs, and their order of execution + - build + - test + - deploy + +docker-build: + # Use the official docker image. + image: docker:latest + stage: build + services: + - docker:dind + before_script: + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY + # Default branch leaves tag empty (= latest tag) + # All other branches are tagged with the escaped branch name (commit ref slug) + script: + - | + if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then + tag="" + echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'" + else + tag=":$CI_COMMIT_REF_SLUG" + echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag" + fi + - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" . + - docker push "$CI_REGISTRY_IMAGE${tag}" + # Run this job in a branch where a Dockerfile exists + rules: + - if: $CI_COMMIT_BRANCH + exists: + - Dockerfile From 20437c489964e7a4064147bae395e39cbe3f9421 Mon Sep 17 00:00:00 2001 From: Aaron Date: Sun, 6 Mar 2022 09:58:45 +0100 Subject: [PATCH 3/8] Do not run the container as root --- Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e67c0f6..0fe06c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,14 @@ FROM python:slim WORKDIR ./ +ARG PUID=1000 +ENV USER docker +ENV HOMEDIR "/home/${USER}" -COPY requirements.txt ./ +RUN useradd -u "${PUID}" -m "${USER}" +USER ${USER} +WORKDIR ${HOMEDIR} +COPY . . RUN pip install --no-cache-dir -r requirements.txt -COPY . . - CMD [ "python", "./bot.py" ] \ No newline at end of file From 7a555694e5ea705f124ff45a6e57565561f1f7fc Mon Sep 17 00:00:00 2001 From: Aaron Date: Sun, 6 Mar 2022 10:43:44 +0100 Subject: [PATCH 4/8] update README --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 99d1079..e8d0f90 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,20 @@ der Bot für den SecondHemd Discord + # Build ``` -docker build https://git.ar21.de/aaron/shbot.git -t aaronriedel/shbot:latest +docker build -t docker-registry.cxservers.com/aaron-riedel/shbot:latest . +``` +# Run +``` +sudo docker run -e 'TOKEN=' -e 'PREFIX=$' -t docker-registry.cxservers.com/aaron-riedel/shbot ``` - # Docker compose ``` services: bot: - image: aaronriedel/shbot:latest + image: docker-registry.cxservers.com/aaron-riedel/shbot:latest container_name: shbot restart: unless-stopped environment: From 615b011c443e131f9b0448ec800256d39d4adbe6 Mon Sep 17 00:00:00 2001 From: Aaron Date: Sun, 6 Mar 2022 11:01:38 +0100 Subject: [PATCH 5/8] update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e8d0f90..aa0bddb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # SECOND BOT - +[![pipeline status](https://git.cxservers.com/aaron-riedel/shbot/badges/master/pipeline.svg)](https://git.cxservers.com/aaron-riedel/shbot/-/commits/master) der Bot für den SecondHemd Discord From a79409b7afaeaae28a76a0ded3bea0b2523d0a66 Mon Sep 17 00:00:00 2001 From: Aaron Date: Sun, 6 Mar 2022 11:02:51 +0100 Subject: [PATCH 6/8] update README --- README.md | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index aa0bddb..f12b536 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,16 @@ [![pipeline status](https://git.cxservers.com/aaron-riedel/shbot/badges/master/pipeline.svg)](https://git.cxservers.com/aaron-riedel/shbot/-/commits/master) der Bot für den SecondHemd Discord - -# Build +# Latest +## Build ``` docker build -t docker-registry.cxservers.com/aaron-riedel/shbot:latest . ``` -# Run +## Run ``` -sudo docker run -e 'TOKEN=' -e 'PREFIX=$' -t docker-registry.cxservers.com/aaron-riedel/shbot +sudo docker run -e 'TOKEN=' -e 'PREFIX=$' -t docker-registry.cxservers.com/aaron-riedel/shbot:latest ``` -# Docker compose +## Docker compose ``` services: bot: @@ -21,4 +21,25 @@ services: environment: - TOKEN=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - PREFIX=X +``` + +# Development +## Build +``` +docker build -t docker-registry.cxservers.com/aaron-riedel/shbot:dev . +``` +## Run +``` +sudo docker run -e 'TOKEN=' -e 'PREFIX=$' -t docker-registry.cxservers.com/aaron-riedel/shbot:dev +``` +## Docker compose +``` +services: + bot: + image: docker-registry.cxservers.com/aaron-riedel/shbot:dev + container_name: shbot + restart: unless-stopped + environment: + - TOKEN=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + - PREFIX=X ``` \ No newline at end of file From 4973ba8c15891aa179a4fab51700815ae1fa6d41 Mon Sep 17 00:00:00 2001 From: Aaron Date: Sun, 6 Mar 2022 11:03:27 +0100 Subject: [PATCH 7/8] update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f12b536..baebe92 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # SECOND BOT [![pipeline status](https://git.cxservers.com/aaron-riedel/shbot/badges/master/pipeline.svg)](https://git.cxservers.com/aaron-riedel/shbot/-/commits/master) + der Bot für den SecondHemd Discord # Latest From 0fc89a8c2481407dbb25a03f99079e6fe0e05428 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Sun, 6 Mar 2022 10:08:42 +0000 Subject: [PATCH 8/8] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37f9f5d..96fec09 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,3 +29,4 @@ docker-build: - if: $CI_COMMIT_BRANCH exists: - Dockerfile + - if: $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "dev" \ No newline at end of file