RepoMirrors
/
hydrus
mirror of https://github.com/hydrusnetwork/hydrus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1262 from Suika/docker-change 

Updating Docker build and GHA
This commit is contained in:
Hydrus Network Developer 2022-11-01 22:43:59 -05:00 committed by GitHub
parent 369525594e 19f28cae49
commit e670054e48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.github/workflows/docker_build.yml vendored
View File

@ -14,10 +14,10 @@ jobs:
-
name: Docker meta
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v2
uses: docker/metadata-action@v4
with:
images: |
ghcr.io/hydrusnetwork/hydrus
ghcr.io/${{ github.repository }}
tags: |
type=ref,event=tag
labels: |
@ -26,23 +26,21 @@ jobs:
org.opencontainers.image.vendor=hydrusnetwork
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
with:
buildkitd-flags: "--debug"
uses: docker/setup-buildx-action@v2
-
name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
@ -50,6 +48,8 @@ jobs:
platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
build-server:
runs-on: ubuntu-latest
@ -60,10 +60,10 @@ jobs:
-
name: Docker meta
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v2
uses: docker/metadata-action@v4
with:
images: |
ghcr.io/hydrusnetwork/hydrus
ghcr.io/${{ github.repository }}
tags: |
type=ref,event=tag,prefix=server-
type=raw,enable=true,prefix=,suffix=,value=server
@ -75,23 +75,21 @@ jobs:
org.opencontainers.image.vendor=hydrusnetwork
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
with:
buildkitd-flags: "--debug"
uses: docker/setup-buildx-action@v2
-
name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
@ -99,3 +97,5 @@ jobs:
platforms: linux/amd64,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max

6
static/build_files/docker/client/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ghcr.io/suika/opencv-video-minimal:4.5.2-py3.9
FROM alpine:3.16
ARG UID
ARG GID
@ -9,9 +9,9 @@ LABEL git="https://github.com/hydrusnetwork/hydrus"
RUN apk --no-cache add fvwm x11vnc xvfb supervisor opencv mpv mpv-libs ffmpeg jq \
openssl nodejs patch font-noto font-noto-emoji font-noto-cjk \
py3-pyside2 py3-beautifulsoup4 py3-pillow py3-numpy py3-openssl py3-pip \
py3-pyside6 py3-beautifulsoup4 py3-pillow py3-numpy py3-openssl py3-pip py3-opencv py3-lxml py3-chardet \
py3-psutil py3-pysocks py3-requests py3-twisted py3-yaml py3-lz4 py3-html5lib py3-dateutil
RUN pip install qtpy Send2Trash python-mpv cloudscraper pyparsing
RUN pip install qtpy Send2Trash python-mpv cloudscraper pyparsing cbor2
RUN set -xe \
&& mkdir -p /opt/hydrus \

2
static/build_files/docker/client/entrypoint.sh
View File

@ -13,7 +13,7 @@ if [ -f "/opt/hydrus/static/build_files/docker/client/patch.patch" ]; then
fi
if [ -f "/opt/hydrus/static/build_files/docker/client/requests.patch" ]; then
cd /usr/lib/python3.9/site-packages/requests
cd /usr/lib/python3.10/site-packages/requests
echo "Patching Requests"
patch -f -p2 -i /opt/hydrus/static/build_files/docker/client/requests.patch
cd /opt/hydrus/

44
static/build_files/docker/docker_build.yml
View File

@ -10,14 +10,14 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@v3
-
name: Docker meta
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v2
uses: docker/metadata-action@v4
with:
images: |
ghcr.io/hydrusnetwork/hydrus
ghcr.io/${{ github.repository }}
tags: |
type=ref,event=tag
labels: |
@ -26,23 +26,21 @@ jobs:
org.opencontainers.image.vendor=hydrusnetwork
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
with:
buildkitd-flags: "--debug"
uses: docker/setup-buildx-action@v2
-
name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
@ -50,20 +48,22 @@ jobs:
platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
build-server:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@v3
-
name: Docker meta
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v2
uses: docker/metadata-action@v4
with:
images: |
ghcr.io/hydrusnetwork/hydrus
ghcr.io/${{ github.repository }}
tags: |
type=ref,event=tag,prefix=server-
type=raw,enable=true,prefix=,suffix=,value=server
@ -75,23 +75,21 @@ jobs:
org.opencontainers.image.vendor=hydrusnetwork
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
with:
buildkitd-flags: "--debug"
uses: docker/setup-buildx-action@v2
-
name: Login to GHCR
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
@ -99,3 +97,5 @@ jobs:
platforms: linux/amd64,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max

4
static/build_files/docker/server/Dockerfile
View File

@ -1,9 +1,9 @@
FROM suika/opencv-video-minimal:4.2-py3.7.5
FROM alpine:3.16
ARG UID
ARG GID
RUN apk --no-cache add py3-beautifulsoup4 py3-psutil py3-pysocks py3-requests py3-twisted py3-yaml py3-lz4 ffmpeg py3-pillow py3-numpy py3-openssl py3-service_identity openssl su-exec py3-dateutil
RUN apk --no-cache add py3-beautifulsoup4 py3-psutil py3-pysocks py3-requests py3-twisted py3-yaml py3-lz4 ffmpeg py3-pillow py3-numpy py3-openssl py3-service_identity py3-opencv py3-lxml py3-chardet py3-dateutil py3-pip openssl su-exec
RUN pip install Send2Trash twisted
RUN set -xe \