Merge pull request #216 from PyDrocsid/template

Merge Template

Author: Defelo

.dockerignore

@@ -1,10 +1,11 @@
+**/.venv
 .github
 .dockerignore
 *.env
 .gitignore
 docker-compose.yml
 Dockerfile
 .idea
-__pycache__
+**/__pycache__
 README.md
 LICENSE

.github/workflows/ci.yml

@@ -137,7 +137,7 @@ jobs:
         uses: docker/setup-qemu-action@v1.2.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.6.0
+        uses: docker/setup-buildx-action@v1.7.0
 
       - name: Cache Docker layers
         uses: actions/cache@v3

.gitmodules

@@ -2,7 +2,7 @@
 	path = bot/cogs/library
 	url = ../../PyDrocsid/cogs.git
 	branch = develop
-[submodule "bot/library"]
-	path = bot/library
+[submodule "library"]
+	path = library
 	url = ../../PyDrocsid/library.git
 	branch = develop

Dockerfile

@@ -8,8 +8,10 @@ RUN pip install poetry
 
 COPY pyproject.toml /build/
 COPY poetry.lock /build/
+COPY library /build/library
 
 RUN set -ex \
+    && sed -i 's/develop = true/develop = false/' pyproject.toml poetry.lock \
     && virtualenv .venv \
     && . .venv/bin/activate \
     && poetry install -n --no-root --no-dev
@@ -26,17 +28,19 @@ WORKDIR /app
 RUN set -x \
     && apk add --no-cache libpq \
     && addgroup -g 1000 bot \
-    && adduser -G bot -u 1000 -s /bin/bash -D -H bot \
+    && adduser -G bot -u 1000 -s /bin/sh -D -H bot \
     && touch health && chown 1000:1000 health
 
-USER bot
-
 COPY --from=builder /build/.venv/lib /usr/local/lib
 COPY --from=builder /build/VERSION /app/
 
 COPY config.yml /app/
 COPY bot /app/bot/
 
+RUN pip uninstall -y pip setuptools
+
+USER bot
+
 HEALTHCHECK --interval=10s --timeout=5s --retries=1 \
     CMD sh -c 'test $(expr $(date +%s) - $(cat health)) -lt 30'