mirror of https://github.com/miaowware/qrm2.git
Compare commits
3 Commits
abdc5ebacb
...
444687bd12
Author | SHA1 | Date |
---|---|---|
classabbyamp | 444687bd12 | |
classabbyamp | 86da8d135a | |
classabbyamp | 67add85a7a |
|
@ -3,6 +3,10 @@
|
|||
name: Docker Build and Deploy
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
push:
|
||||
# Publish `master` as Docker `dev` image.
|
||||
branches:
|
||||
|
@ -11,29 +15,43 @@ on:
|
|||
tags:
|
||||
- v*
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
docker:
|
||||
name: Build and push docker images
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
packages: write
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
ref: ${{ github.ref }}
|
||||
uses: classabbyamp/treeless-checkout-action@v1
|
||||
|
||||
- name: Write ref to file
|
||||
if: ${{ github.event_name != 'pull_request' }}
|
||||
run: git rev-list -n 1 $GITHUB_REF > ./git_commit
|
||||
|
||||
- name: Build image
|
||||
id: build_image
|
||||
run: |
|
||||
IMAGE_ID=${GITHUB_REPOSITORY,,}
|
||||
IMAGE_NAME=${IMAGE_ID#*/}
|
||||
echo "image_id=$IMAGE_ID" >> $GITHUB_ENV
|
||||
echo "image_name=$IMAGE_NAME" >> $GITHUB_ENV
|
||||
docker build . --file Dockerfile -t $IMAGE_NAME
|
||||
- name: Docker metadata
|
||||
id: meta
|
||||
uses: docker/metadata-action@v4
|
||||
with:
|
||||
images: |
|
||||
ghcr.io/${{ github.repository }}
|
||||
tags: |
|
||||
type=sha,prefix=
|
||||
type=raw,value=dev,enable={{is_default_branch}}
|
||||
type=raw,event=tag,value=latest,enable={{is_default_branch}}
|
||||
type=ref,event=tag,prefix=,enable={{is_default_branch}},priority=1000
|
||||
flavor: latest=false
|
||||
labels: |
|
||||
org.opencontainers.image.authors=classabbyamp and 0x5c
|
||||
org.opencontainers.image.url=https://github.com/miaowware/qrm2
|
||||
org.opencontainers.image.source=https://github.com/${{ github.repository }}
|
||||
org.opencontainers.image.vendor=miaowware
|
||||
org.opencontainers.image.title=qrm2
|
||||
org.opencontainers.image.description=Discord bot with ham radio functions
|
||||
|
||||
- name: Login to Github Container Registry
|
||||
uses: docker/login-action@v1
|
||||
|
@ -42,41 +60,10 @@ jobs:
|
|||
username: ${{ github.repository_owner }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Tag image
|
||||
id: tag_image
|
||||
run: |
|
||||
IMAGE_NAME=${{ env.image_name }}
|
||||
IMAGE_ID=ghcr.io/${{ env.image_id }}
|
||||
echo IMAGE_ID=$IMAGE_ID
|
||||
echo "image_id=$IMAGE_ID" >> $GITHUB_ENV
|
||||
|
||||
# Strip git ref prefix from version
|
||||
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
|
||||
# Strip "v" prefix from tag name
|
||||
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
|
||||
# if version is master, set version to dev
|
||||
[[ "$VERSION" == "master" ]] && VERSION=dev
|
||||
echo VERSION=$VERSION
|
||||
echo "version=$VERSION" >> $GITHUB_ENV
|
||||
|
||||
# tag dev or x.x.x
|
||||
docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
|
||||
# tag latest if not a dev release
|
||||
[[ "$VERSION" != "dev" ]] && docker tag $IMAGE_NAME $IMAGE_ID:latest || true
|
||||
|
||||
- name: Push images to registry
|
||||
run: |
|
||||
VERSION=${{ env.version }}
|
||||
IMAGE_ID=${{ env.image_id }}
|
||||
|
||||
[[ "$VERSION" != "dev" ]] && docker push $IMAGE_ID:latest || true
|
||||
docker push $IMAGE_ID:$VERSION
|
||||
|
||||
- name: Deploy official images
|
||||
id: deploy_images
|
||||
uses: satak/webrequest-action@v1
|
||||
- name: Build and push
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
url: ${{ secrets.DEPLOY_URL }}
|
||||
method: POST
|
||||
headers: '{"Authentication": "Token ${{ secrets.DEPLOY_TOKEN }}"}'
|
||||
payload: '{"version": "${{ env.version }}"}'
|
||||
context: .
|
||||
push: ${{ github.event_name != 'pull_request' }}
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
|
|
15
Dockerfile
15
Dockerfile
|
@ -1,10 +1,9 @@
|
|||
FROM ghcr.io/void-linux/void-linux:latest-full-x86_64-musl
|
||||
LABEL org.opencontainers.image.source https://github.com/miaowware/qrm2
|
||||
FROM ghcr.io/void-linux/void-musl-full
|
||||
|
||||
COPY . /app
|
||||
WORKDIR /app
|
||||
|
||||
ARG REPOSITORY=https://repo-us.voidlinux.org/current
|
||||
ARG REPOSITORY=https://repo-fastly.voidlinux.org/current
|
||||
ARG PKGS="cairo libjpeg-turbo"
|
||||
ARG UID 1000
|
||||
ARG GID 1000
|
||||
|
@ -14,19 +13,19 @@ RUN \
|
|||
xbps-install -Suy xbps -R ${REPOSITORY} && \
|
||||
xbps-install -uy -R ${REPOSITORY} && \
|
||||
echo "**** install system packages ****" && \
|
||||
xbps-install -y -R ${REPOSITORY} ${PKGS} python3 python3-pip && \
|
||||
xbps-install -y -R ${REPOSITORY} ${PKGS} python3.11 && \
|
||||
echo "**** install pip packages ****" && \
|
||||
pip3 install -U pip setuptools wheel && \
|
||||
pip3 install -r requirements.txt && \
|
||||
python3.11 -m venv botenv && \
|
||||
botenv/bin/pip install -U pip setuptools wheel && \
|
||||
botenv/bin/pip install -r requirements.txt && \
|
||||
echo "**** clean up ****" && \
|
||||
rm -rf \
|
||||
/root/.cache \
|
||||
/tmp/* \
|
||||
/var/cache/xbps/*
|
||||
|
||||
ENV PYTHON_BIN python3
|
||||
ENV PYTHONUNBUFFERED 1
|
||||
|
||||
USER $UID:$GID
|
||||
|
||||
CMD ["/bin/sh", "run.sh", "--pass-errors", "--no-botenv"]
|
||||
CMD ["/bin/sh", "run.sh", "--pass-errors"]
|
||||
|
|
8
run.sh
8
run.sh
|
@ -17,7 +17,7 @@ fi
|
|||
# Argument handling
|
||||
_PASS_ERRORS=0
|
||||
_NO_BOTENV=0
|
||||
while [ ! -z "$1" ]; do
|
||||
while [ -n "$1" ]; do
|
||||
case $1 in
|
||||
--pass-errors)
|
||||
_PASS_ERRORS=1
|
||||
|
@ -35,7 +35,7 @@ done
|
|||
|
||||
|
||||
# If $PYTHON_BIN is not defined, default to 'python3.11'
|
||||
if [ $_NO_BOTENV -eq 1 -a -z "$PYTHON_BIN" ]; then
|
||||
if [ $_NO_BOTENV -eq 1 ] && [ -z "$PYTHON_BIN" ]; then
|
||||
PYTHON_BIN='python3.11'
|
||||
fi
|
||||
|
||||
|
@ -69,9 +69,9 @@ echo "$0: Starting bot..."
|
|||
# The loop
|
||||
while true; do
|
||||
if [ $_NO_BOTENV -eq 1 ]; then
|
||||
"$PYTHON_BIN" main.py $@
|
||||
"$PYTHON_BIN" main.py "$@"
|
||||
else
|
||||
./$BOTENV/bin/python3 main.py $@
|
||||
"./$BOTENV/bin/python3" main.py "$@"
|
||||
fi
|
||||
err=$?
|
||||
_message="$0: The bot exited with [$err]"
|
||||
|
|
Loading…
Reference in New Issue