miaowware/qrm2
1
0
Fork 0
mirror of https://github.com/miaowware/qrm2.git synced 2024-11-21 23:45:16 -05:00
Code Issues Actions Projects Releases Wiki Activity

move to new void docker image, clean up dockerfile (#436)

Browse Source 
Co-authored-by: 0x5c <dev@0x5c.io>
This commit is contained in:
classabbyamp 2021-11-05 17:51:46 -04:00 committed by GitHub
parent 8f1782dcc0
commit 80d6a989cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Dockerfile
View File

@ -1,17 +1,19 @@
FROM voidlinux/voidlinux FROM ghcr.io/void-linux/void-linux:latest-mini-x86_64
LABEL org.opencontainers.image.source https://github.com/miaowware/qrm2
COPY . /app COPY . /app
WORKDIR /app WORKDIR /app
ENV PYTHON_BIN python3 ARG REPOSITORY=https://repo-us.voidlinux.org/current
ARG PKGS="cairo libjpeg-turbo"
ARG UID 1000
ARG GID 1000
RUN \ RUN \
echo "**** update packages ****" && \ echo "**** update system ****" && \
xbps-install -Suy && \ xbps-install -SuyM -R ${REPOSITORY} && \
echo "**** install system packages ****" && \ echo "**** install system packages ****" && \
export runtime_deps='cairo libjpeg-turbo' && \ xbps-install -yM -R ${REPOSITORY} ${PKGS} python3 python3-pip && \
export runtime_pkgs="${runtime_deps} python3-pip python3" && \
xbps-install -y $runtime_pkgs && \
echo "**** install pip packages ****" && \ echo "**** install pip packages ****" && \
pip3 install -U pip setuptools wheel && \ pip3 install -U pip setuptools wheel && \
pip3 install -r requirements.txt && \ pip3 install -r requirements.txt && \
@ -21,10 +23,9 @@ RUN \
/tmp/* \ /tmp/* \
/var/cache/xbps/* /var/cache/xbps/*
ARG UID ENV PYTHON_BIN python3
ENV UID=${UID:-1000} ENV PYTHONUNBUFFERED 1
ARG GID
ENV GID=${GID:-1000}
USER $UID:$GID USER $UID:$GID
CMD ["/bin/sh", "run.sh", "--pass-errors", "--no-botenv"] CMD ["/bin/sh", "run.sh", "--pass-errors", "--no-botenv"]

9
README-DOCKER.md
View File

@ -23,14 +23,11 @@ This is the easiest method for running the bot without any modifications.
version: '3' version: '3'
services: services:
qrm2: qrm2:
image: "docker.pkg.github.com/miaowware/qrm2/qrm2:latest" image: "ghcr.io/miaowware/qrm2:latest"
restart: on-failure restart: on-failure
volumes: volumes:
- "./data:/app/data:rw" - "./data:/app/data:rw"
environment:
- PYTHONUNBUFFERED=1
``` ```
*Note that Github's registry requires [a few extra steps](https://docs.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages) during the initial setup.*
3. Create a subdirectory named `data`. 3. Create a subdirectory named `data`.
@ -64,8 +61,6 @@ This is the easiest method to run the bot with modifications.
restart: on-failure restart: on-failure
volumes: volumes:
- "./data:/app/data:rw" - "./data:/app/data:rw"
environment:
- PYTHONUNBUFFERED=1
``` ```
3. Create a subdirectory named `data`. 3. Create a subdirectory named `data`.
@ -112,4 +107,4 @@ This methods is not very nice to use.
Where `[image]` is either of: Where `[image]` is either of:
- `qrm2:local-latest` if you are building your own. - `qrm2:local-latest` if you are building your own.
- `docker.pkg.github.com/miaowware/qrm2/qrm2:latest` if you want to use the prebuilt image. - `ghcr.io/miaowware/qrm2:latest` if you want to use the prebuilt image.