Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

VNC support #26

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
Draft

VNC support #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bdc689f
Initial VNC support
Syer10 Jan 2, 2023
2fed9c1
Fix 4567 port expose dupe
Syer10 Jan 2, 2023
f6db605
Move things around
Syer10 Jan 3, 2023
8bbac88
Merge branch 'vnc' of https://github.com/Suwayomi/docker-tachidesk in…
Syer10 Jan 3, 2023
c5798ad
Test
Syer10 Jan 3, 2023
23427e1
Revert "Test"
Syer10 Jan 3, 2023
04301b5
Don't use a password for VNC by default
Syer10 Jan 3, 2023
129cf0c
Branch env
Syer10 Jan 10, 2023
8d4ddf1
Forgot env
Syer10 Jan 10, 2023
d867e3e
Manual branch
Syer10 Jan 10, 2023
0f3f780
Debug
Syer10 Jan 10, 2023
0a0c60a
Revert "Debug"
Syer10 Jan 10, 2023
29529be
Try adding platform to the top
Syer10 Jan 10, 2023
d74953f
Debug
Syer10 Jan 10, 2023
48fa683
Revert "Debug"
Syer10 Jan 11, 2023
e8e0103
Add dependencies
Syer10 Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 69 additions & 15 deletions .github/workflows/build_container_images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ env:
build_base_image_alpine: 'alpine:3.16'
build_base_image_alpine_platform: 'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x'
build_base_image_alpine_platform_testing: 'linux/amd64'
startup_script_url: 'https://raw.githubusercontent.com/${{ github.repository }}/main/scripts/startup_script.sh'
startup_script_url: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/scripts/startup_script.sh'
startup_script_url_alpine: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/scripts/startup_script_alpine.sh'
supervisord_url: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/supervisord.conf'
supervisord_tachidesk_conf_url: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/conf.d/tachidesk.conf'
supervisord_websockify_conf_url: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/conf.d/websockify.conf'
supervisord_x11vnc_conf_url: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/conf.d/x11vnc.conf'
supervisord_xvfb_conf_url: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/conf.d/xvfb.conf'
tachidesk_webui_stable_url: 'https://api.github.com/repos/suwayomi/Tachidesk-Server/releases/latest'
tachidesk_webui_preview_url: 'https://api.github.com/repos/suwayomi/Tachidesk-Server-preview/releases/latest'

Expand Down Expand Up @@ -197,14 +203,20 @@ jobs:
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin }}
BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }}
PLATFORM=ubuntu
IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }}
IMAGE_TYPE=stable-ubuntu
IMAGE_TYPE=stable
TACHIDESK_GIT_COMMIT=${{ steps.get_latest_release_metadata.outputs.release_commit }}
TACHIDESK_RELEASE_TAG=${{ steps.get_latest_release_metadata.outputs.release_tag }}
TACHIDESK_RELEASE_DOWNLOAD_URL=${{ steps.get_latest_release_metadata.outputs.release_url }}
TACHIDESK_FILENAME=${{ steps.get_latest_release_metadata.outputs.release_filename }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url }}
TACHIDESK_DOCKER_GIT_COMMIT=${{ steps.get_latest_release_metadata.outputs.tachidesk_docker_git_commit }}
SUPERVISORD_URL=${{ env.supervisord_url }}
SUPERVISORD_TACHIDESK_URL=${{ env.supervisord_tachidesk_conf_url }}
SUPERVISORD_WEBSOCKIFY_URL=${{ env.supervisord_websockify_conf_url }}
SUPERVISORD_X11VNC_URL=${{ env.supervisord_x11vnc_conf_url }}
SUPERVISORD_XVFB_URL=${{ env.supervisord_xvfb_conf_url }}
tags: |
test-image:stable
outputs: type=docker,dest=/tmp/test_image_stable.tar
Expand Down Expand Up @@ -246,14 +258,20 @@ jobs:
build-args: |
BASE_IMAGE=${{ env.build_base_image_alpine }}
BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }}
PLATFORM=alpine
IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }}
IMAGE_TYPE=stable-alpine
IMAGE_TYPE=stable
TACHIDESK_GIT_COMMIT=${{ steps.get_latest_release_metadata.outputs.release_commit }}
TACHIDESK_RELEASE_TAG=${{ steps.get_latest_release_metadata.outputs.release_tag }}
TACHIDESK_RELEASE_DOWNLOAD_URL=${{ steps.get_latest_release_metadata.outputs.release_url }}
TACHIDESK_FILENAME=${{ steps.get_latest_release_metadata.outputs.release_filename }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url_alpine }}
TACHIDESK_DOCKER_GIT_COMMIT=${{ steps.get_latest_release_metadata.outputs.tachidesk_docker_git_commit }}
SUPERVISORD_URL=${{ env.supervisord_url }}
SUPERVISORD_TACHIDESK_URL=${{ env.supervisord_tachidesk_conf_url }}
SUPERVISORD_WEBSOCKIFY_URL=${{ env.supervisord_websockify_conf_url }}
SUPERVISORD_X11VNC_URL=${{ env.supervisord_x11vnc_conf_url }}
SUPERVISORD_XVFB_URL=${{ env.supervisord_xvfb_conf_url }}
tags: |
test-image:stable-alpine
outputs: type=docker,dest=/tmp/test_image_stable_alpine.tar
Expand Down Expand Up @@ -331,15 +349,21 @@ jobs:
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin }}
BUILD_DATE=${{ needs.check_stable.outputs.build_date }}
PLATFORM=ubuntu
IMAGE_VERSION=${{ needs.check_stable.outputs.release_version }}
IMAGE_TYPE=stable-ubuntu
IMAGE_TYPE=stable
TACHIDESK_GIT_COMMIT=${{ needs.check_stable.outputs.release_commit }}
TACHIDESK_RELEASE_TAG=${{ needs.check_stable.outputs.release_tag }}
TACHIDESK_RELEASE_DOWNLOAD_URL=${{ needs.check_stable.outputs.release_url }}
TACHIDESK_FILENAME=${{ needs.check_stable.outputs.release_filename }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url }}
TACHIDESK_DOCKER_GIT_COMMIT=${{ needs.check_stable.outputs.tachidesk_docker_git_commit }}
IMAGE_OWNER=${{ needs.check_stable.outputs.repository_owner_lower }}
SUPERVISORD_URL=${{ env.supervisord_url }}
SUPERVISORD_TACHIDESK_URL=${{ env.supervisord_tachidesk_conf_url }}
SUPERVISORD_WEBSOCKIFY_URL=${{ env.supervisord_websockify_conf_url }}
SUPERVISORD_X11VNC_URL=${{ env.supervisord_x11vnc_conf_url }}
SUPERVISORD_XVFB_URL=${{ env.supervisord_xvfb_conf_url }}
tags: |
ghcr.io/${{ needs.check_stable.outputs.repository_owner_lower }}/${{ env.build_repo_docker }}:latest
ghcr.io/${{ needs.check_stable.outputs.repository_owner_lower }}/${{ env.build_repo_docker }}:stable
Expand All @@ -360,15 +384,21 @@ jobs:
build-args: |
BASE_IMAGE=${{ env.build_base_image_alpine }}
BUILD_DATE=${{ needs.check_stable.outputs.build_date }}
PLATFORM=alpine
IMAGE_VERSION=${{ needs.check_stable.outputs.release_version }}
IMAGE_TYPE=stable-alpine
IMAGE_TYPE=stable
TACHIDESK_GIT_COMMIT=${{ needs.check_stable.outputs.release_commit }}
TACHIDESK_RELEASE_TAG=${{ needs.check_stable.outputs.release_tag }}
TACHIDESK_RELEASE_DOWNLOAD_URL=${{ needs.check_stable.outputs.release_url }}
TACHIDESK_FILENAME=${{ needs.check_stable.outputs.release_filename }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url_alpine }}
TACHIDESK_DOCKER_GIT_COMMIT=${{ needs.check_stable.outputs.tachidesk_docker_git_commit }}
IMAGE_OWNER=${{ needs.check_stable.outputs.repository_owner_lower }}
SUPERVISORD_URL=${{ env.supervisord_url }}
SUPERVISORD_TACHIDESK_URL=${{ env.supervisord_tachidesk_conf_url }}
SUPERVISORD_WEBSOCKIFY_URL=${{ env.supervisord_websockify_conf_url }}
SUPERVISORD_X11VNC_URL=${{ env.supervisord_x11vnc_conf_url }}
SUPERVISORD_XVFB_URL=${{ env.supervisord_xvfb_conf_url }}
tags: |
ghcr.io/${{ needs.check_stable.outputs.repository_owner_lower }}/${{ env.build_repo_docker }}:latest-alpine
ghcr.io/${{ needs.check_stable.outputs.repository_owner_lower }}/${{ env.build_repo_docker }}:stable-alpine
Expand Down Expand Up @@ -464,14 +494,20 @@ jobs:
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin }}
BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }}
PLATFORM=ubuntu
IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }}
IMAGE_TYPE=preview-ubuntu
IMAGE_TYPE=preview
TACHIDESK_GIT_COMMIT=${{ steps.get_latest_release_metadata.outputs.release_commit }}
TACHIDESK_RELEASE_TAG=${{ steps.get_latest_release_metadata.outputs.release_tag }}
TACHIDESK_RELEASE_DOWNLOAD_URL=${{ steps.get_latest_release_metadata.outputs.release_url }}
TACHIDESK_FILENAME=${{ steps.get_latest_release_metadata.outputs.release_filename }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url }}
TACHIDESK_DOCKER_GIT_COMMIT=${{ steps.get_latest_release_metadata.outputs.tachidesk_docker_git_commit }}
SUPERVISORD_URL=${{ env.supervisord_url }}
SUPERVISORD_TACHIDESK_URL=${{ env.supervisord_tachidesk_conf_url }}
SUPERVISORD_WEBSOCKIFY_URL=${{ env.supervisord_websockify_conf_url }}
SUPERVISORD_X11VNC_URL=${{ env.supervisord_x11vnc_conf_url }}
SUPERVISORD_XVFB_URL=${{ env.supervisord_xvfb_conf_url }}
tags: |
test-image:preview
outputs: type=docker,dest=/tmp/test_image_preview.tar
Expand Down Expand Up @@ -515,14 +551,20 @@ jobs:
build-args: |
BASE_IMAGE=${{ env.build_base_image_alpine }}
BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }}
PLATFORM=alpine
IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }}
IMAGE_TYPE=preview-alpine
IMAGE_TYPE=preview
TACHIDESK_GIT_COMMIT=${{ steps.get_latest_release_metadata.outputs.release_commit }}
TACHIDESK_RELEASE_TAG=${{ steps.get_latest_release_metadata.outputs.release_tag }}
TACHIDESK_RELEASE_DOWNLOAD_URL=${{ steps.get_latest_release_metadata.outputs.release_url }}
TACHIDESK_FILENAME=${{ steps.get_latest_release_metadata.outputs.release_filename }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url_alpine }}
TACHIDESK_DOCKER_GIT_COMMIT=${{ steps.get_latest_release_metadata.outputs.tachidesk_docker_git_commit }}
SUPERVISORD_URL=${{ env.supervisord_url }}
SUPERVISORD_TACHIDESK_URL=${{ env.supervisord_tachidesk_conf_url }}
SUPERVISORD_WEBSOCKIFY_URL=${{ env.supervisord_websockify_conf_url }}
SUPERVISORD_X11VNC_URL=${{ env.supervisord_x11vnc_conf_url }}
SUPERVISORD_XVFB_URL=${{ env.supervisord_xvfb_conf_url }}
tags: |
test-image:preview-alpine
outputs: type=docker,dest=/tmp/test_image_preview_alpine.tar
Expand Down Expand Up @@ -602,15 +644,21 @@ jobs:
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin }}
BUILD_DATE=${{ needs.check_preview.outputs.build_date }}
PLATFORM=ubuntu
IMAGE_VERSION=${{ needs.check_preview.outputs.release_version }}
IMAGE_TYPE=preview-ubuntu
IMAGE_TYPE=preview
TACHIDESK_GIT_COMMIT=${{ needs.check_preview.outputs.release_commit }}
TACHIDESK_RELEASE_TAG=${{ needs.check_preview.outputs.release_tag }}
TACHIDESK_RELEASE_DOWNLOAD_URL=${{ needs.check_preview.outputs.release_url }}
TACHIDESK_FILENAME=${{ needs.check_preview.outputs.release_filename }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url }}
TACHIDESK_DOCKER_GIT_COMMIT=${{ needs.check_preview.outputs.tachidesk_docker_git_commit }}
IMAGE_OWNER=${{ needs.check_preview.outputs.repository_owner_lower }}
IMAGE_OWNER=${{ needs.check_preview.outputs.repository_owner_lower }}
SUPERVISORD_URL=${{ env.supervisord_url }}
SUPERVISORD_TACHIDESK_URL=${{ env.supervisord_tachidesk_conf_url }}
SUPERVISORD_WEBSOCKIFY_URL=${{ env.supervisord_websockify_conf_url }}
SUPERVISORD_X11VNC_URL=${{ env.supervisord_x11vnc_conf_url }}
SUPERVISORD_XVFB_URL=${{ env.supervisord_xvfb_conf_url }}
tags: |
ghcr.io/${{ needs.check_preview.outputs.repository_owner_lower }}/${{ env.build_repo_docker }}:preview
ghcr.io/${{ needs.check_preview.outputs.repository_owner_lower }}/${{ env.build_repo_docker }}:preview-ubuntu
Expand All @@ -627,15 +675,21 @@ jobs:
build-args: |
BASE_IMAGE=${{ env.build_base_image_alpine }}
BUILD_DATE=${{ needs.check_preview.outputs.build_date }}
PLATFORM=alpine
IMAGE_VERSION=${{ needs.check_preview.outputs.release_version }}
IMAGE_TYPE=preview-alpine
IMAGE_TYPE=preview
TACHIDESK_GIT_COMMIT=${{ needs.check_preview.outputs.release_commit }}
TACHIDESK_RELEASE_TAG=${{ needs.check_preview.outputs.release_tag }}
TACHIDESK_RELEASE_DOWNLOAD_URL=${{ needs.check_preview.outputs.release_url }}
TACHIDESK_FILENAME=${{ needs.check_preview.outputs.release_filename }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url_alpine }}
TACHIDESK_DOCKER_GIT_COMMIT=${{ needs.check_preview.outputs.tachidesk_docker_git_commit }}
IMAGE_OWNER=${{ needs.check_preview.outputs.repository_owner_lower }}
IMAGE_OWNER=${{ needs.check_preview.outputs.repository_owner_lower }}
SUPERVISORD_URL=${{ env.supervisord_url }}
SUPERVISORD_TACHIDESK_URL=${{ env.supervisord_tachidesk_conf_url }}
SUPERVISORD_WEBSOCKIFY_URL=${{ env.supervisord_websockify_conf_url }}
SUPERVISORD_X11VNC_URL=${{ env.supervisord_x11vnc_conf_url }}
SUPERVISORD_XVFB_URL=${{ env.supervisord_xvfb_conf_url }}
tags: |
ghcr.io/${{ needs.check_preview.outputs.repository_owner_lower }}/${{ env.build_repo_docker }}:preview-alpine
cache-from: type=local,src=/tmp/.buildx-cache
Expand Down
26 changes: 22 additions & 4 deletions .github/workflows/build_test_images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,14 @@ env:
build_base_image_temurin_platform: 'linux/amd64'
build_base_image_alpine: 'alpine:3.16'
build_base_image_alpine_platform: 'linux/amd64'
startup_script_url: 'https://raw.githubusercontent.com/${{ github.repository }}/main/scripts/startup_script.sh'
startup_script_url: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/scripts/startup_script.sh'
startup_script_url_alpine: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/scripts/startup_script_alpine.sh'
tachidesk_webui_stable_url: 'https://api.github.com/repos/suwayomi/Tachidesk-Server/releases/latest'
supervisord_url: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/supervisord.conf'
supervisord_tachidesk_conf_url: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/conf.d/tachidesk.conf'
supervisord_websockify_conf_url: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/conf.d/websockify.conf'
supervisord_x11vnc_conf_url: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/conf.d/x11vnc.conf'
supervisord_xvfb_conf_url: 'https://raw.githubusercontent.com/${{ github.repository }}/${{ github.head_ref || github.ref_name }}/conf.d/xvfb.conf'

jobs:

Expand Down Expand Up @@ -83,15 +89,21 @@ jobs:
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin }}
BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }}
PLATFORM=ubuntu
IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }}
IMAGE_TYPE=develop-ubuntu
IMAGE_TYPE=develop
TACHIDESK_GIT_COMMIT=${{ steps.get_latest_release_metadata.outputs.release_commit }}
TACHIDESK_RELEASE_TAG=${{ steps.get_latest_release_metadata.outputs.release_tag }}
TACHIDESK_RELEASE_DOWNLOAD_URL=${{ steps.get_latest_release_metadata.outputs.release_url }}
TACHIDESK_FILENAME=${{ steps.get_latest_release_metadata.outputs.release_filename }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url }}
TACHIDESK_DOCKER_GIT_COMMIT=${{ steps.get_latest_release_metadata.outputs.tachidesk_docker_git_commit }}
IMAGE_OWNER=${{ steps.get_latest_release_metadata.outputs.repository_owner_lower }}
SUPERVISORD_URL=${{ env.supervisord_url }}
SUPERVISORD_TACHIDESK_URL=${{ env.supervisord_tachidesk_conf_url }}
SUPERVISORD_WEBSOCKIFY_URL=${{ env.supervisord_websockify_conf_url }}
SUPERVISORD_X11VNC_URL=${{ env.supervisord_x11vnc_conf_url }}
SUPERVISORD_XVFB_URL=${{ env.supervisord_xvfb_conf_url }}
tags: |
ghcr.io/${{ steps.get_latest_release_metadata.outputs.repository_owner_lower }}/${{ env.build_repo_docker }}:develop
cache-from: type=local,src=/tmp/.buildx-cache
Expand All @@ -107,15 +119,21 @@ jobs:
build-args: |
BASE_IMAGE=${{ env.build_base_image_alpine }}
BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }}
PLATFORM=alpine
IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }}
IMAGE_TYPE=develop-alpine
IMAGE_TYPE=develop
TACHIDESK_GIT_COMMIT=${{ steps.get_latest_release_metadata.outputs.release_commit }}
TACHIDESK_RELEASE_TAG=${{ steps.get_latest_release_metadata.outputs.release_tag }}
TACHIDESK_RELEASE_DOWNLOAD_URL=${{ steps.get_latest_release_metadata.outputs.release_url }}
TACHIDESK_FILENAME=${{ steps.get_latest_release_metadata.outputs.release_filename }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url }}
STARTUP_SCRIPT_URL=${{ env.startup_script_url_alpine }}
TACHIDESK_DOCKER_GIT_COMMIT=${{ steps.get_latest_release_metadata.outputs.tachidesk_docker_git_commit }}
IMAGE_OWNER=${{ steps.get_latest_release_metadata.outputs.repository_owner_lower }}
SUPERVISORD_URL=${{ env.supervisord_url }}
SUPERVISORD_TACHIDESK_URL=${{ env.supervisord_tachidesk_conf_url }}
SUPERVISORD_WEBSOCKIFY_URL=${{ env.supervisord_websockify_conf_url }}
SUPERVISORD_X11VNC_URL=${{ env.supervisord_x11vnc_conf_url }}
SUPERVISORD_XVFB_URL=${{ env.supervisord_xvfb_conf_url }}
tags: |
ghcr.io/${{ steps.get_latest_release_metadata.outputs.repository_owner_lower }}/${{ env.build_repo_docker }}:develop-alpine
cache-from: type=local,src=/tmp/.buildx-cache
Expand Down
Loading