diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml old mode 100755 new mode 100644 diff --git a/Dockerfile b/Dockerfile index d25f203b..33526065 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:arch +FROM ghcr.io/linuxserver/baseimage-selkies:arch # set version label ARG BUILD_DATE @@ -12,7 +12,7 @@ ENV TITLE="Arch MATE" RUN \ echo "**** add icon ****" && \ curl -o \ - /kclient/public/icon.png \ + /usr/share/selkies/www/icon.png \ https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \ echo "**** install packages ****" && \ pacman -Sy --noconfirm --needed \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 469fa53f..e196e221 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-arch +FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-arch # set version label ARG BUILD_DATE @@ -12,7 +12,7 @@ ENV TITLE="Arch MATE" RUN \ echo "**** add icon ****" && \ curl -o \ - /kclient/public/icon.png \ + /usr/share/selkies/www/icon.png \ https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \ echo "**** install packages ****" && \ pacman -Sy --noconfirm --needed \ diff --git a/Jenkinsfile b/Jenkinsfile index 9a1d1c45..64c50c0a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,8 +30,8 @@ pipeline { MULTIARCH = 'true' CI = 'true' CI_WEB = 'true' - CI_PORT = '3000' - CI_SSL = 'false' + CI_PORT = '3001' + CI_SSL = 'true' CI_DELAY = '120' CI_DOCKERENV = 'TZ=US/Pacific' CI_AUTH = 'user:password' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 340efb96..b43cf35a 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -20,8 +20,8 @@ repo_vars: - MULTIARCH = 'true' - CI = 'true' - CI_WEB = 'true' - - CI_PORT = '3000' - - CI_SSL = 'false' + - CI_PORT = '3001' + - CI_SSL = 'true' - CI_DELAY = '120' - CI_DOCKERENV = 'TZ=US/Pacific' - CI_AUTH = 'user:password'