Updates the DockerFile to use alpine & bumps to 2.1 (#25)

* Updates the DockerFile to use alpine

* Bumps to 2.1

* Updates the Docker Login action to v3

.github/workflows/docker.yml

@@ -24,7 +24,7 @@ jobs:
           docker build . --file Dockerfile --tag $IMAGE_NAME --squash
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

Dockerfile

@@ -1,40 +1,37 @@
 # For more information, please refer to https://aka.ms/vscode-docker-python
-FROM python:3.11-slim-bullseye as base
+FROM python:3.11-alpine as base
 
 # Keeps Python from generating .pyc files in the container
 # Turns off buffering for easier container logging
 # Prevents poetry from creating a virtualenv
 ENV PYTHONFAULTHANDLER=1 \
     PYTHONHASHSEED=random \
     PYTHONUNBUFFERED=1 \
-	POETRY_VERSION=1.6.1 \
+	POETRY_VERSION=1.7.1 \
 	POETRY_VIRTUALENVS_CREATE=false \
 	PYTHONDONTWRITEBYTECODE=1
 
 COPY ["poetry.lock", "pyproject.toml", "./"]
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends default-libmysqlclient-dev gcc git && \
-    pip install "poetry==$POETRY_VERSION"
+RUN apk add --no-cache mariadb-dev \
+    && apk add --no-cache --virtual build-dependencies gcc git libc-dev linux-headers \
+    && pip install --no-cache-dir "poetry==$POETRY_VERSION"
 
 # Install pip requirements
 
-RUN poetry install --without=dev --no-root --no-interaction --no-ansi
-
-RUN apt-get autoremove gcc git --purge -y && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /root/.cache
+RUN poetry install --without=dev --no-root --no-interaction --no-ansi \
+    && apk del --purge build-dependencies
 
 COPY server-conf/bapi_uwsgi.ini /etc/uwsgi/uwsgi.ini
 
-FROM base as final
 WORKDIR /app
 COPY /src /app
 
-RUN chown -R www-data:www-data /app
+RUN adduser -u 82 -D -S -G www-data www-data \
+    && chown -R www-data:www-data /app
 
 USER www-data:www-data
 
-EXPOSE 8081
+EXPOSE 8080
 
 CMD ["/usr/local/bin/uwsgi", "--ini", "/etc/uwsgi/uwsgi.ini"]

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bapi"
-version = "2.0"
+version = "2.1"
 description = "BeeStation public api"
 authors = ["Qwertyquerty", "Crossedfall"]
 license = "APACHE"

src/bapi/cfg.py

@@ -4,4 +4,4 @@
 SERVERS = yaml.load(open("bapi/config/servers.yml"), Loader=yaml.SafeLoader)
 PRIVATE = yaml.load(open("bapi/config/private.yml"), Loader=yaml.SafeLoader)
 
-VERSION = "2.0"
+VERSION = "2.1"