diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 32b4565..d96386d 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -39,15 +39,10 @@ jobs: token=$(curl -sX GET \ "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fwps-office%3Apull" \ | jq -r '.token') - multidigest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${tag}" \ - | jq -r 'first(.manifests[].digest)') digest=$(curl -s \ --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ + "https://ghcr.io/v2/${image}/manifests/${tag}" \ | jq -r '.config.digest') image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 deleted file mode 100644 index a1965e3..0000000 --- a/Dockerfile.aarch64 +++ /dev/null @@ -1,65 +0,0 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-arch - -# set version label -ARG BUILD_DATE -ARG VERSION -ARG WPSOFFICE_VERSION -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="thelamer" - -# title -ENV TITLE=WPS-Office \ - LC_ALL=zh_CN.UTF-8 \ - NO_FULL=true - -RUN \ - echo "**** add icon ****" && \ - curl -o \ - /kclient/public/icon.png \ - https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/wps-office-icon.png && \ - echo "**** install packages ****" && \ - pacman -Sy --noconfirm --needed \ - chromium \ - noto-fonts-cjk \ - git \ - qt6-base \ - tint2 \ - thunar && \ - echo "**** install wps-office ****" && \ - cd /tmp && \ - git clone https://aur.archlinux.org/wps-office-cn.git && \ - chown -R abc:abc wps-office-cn && \ - cd wps-office-cn && \ - sudo -u abc makepkg -sAci --skipinteg --noconfirm --needed && \ - mkdir /tmp/fonts && \ - curl -o \ - /tmp/fonts.tar.gz -L \ - "https://github.com/BannedPatriot/ttf-wps-fonts/archive/refs/heads/master.tar.gz" && \ - tar xf \ - /tmp/fonts.tar.gz -C \ - /tmp/fonts/ --strip-components=1 && \ - cd /tmp/fonts && \ - bash install.sh && cd / && \ - ln -s \ - /usr/lib/libtiff.so.6 \ - /usr/lib/libtiff.so.5 && \ - echo "**** application tweaks ****" && \ - mv \ - /usr/bin/chromium \ - /usr/bin/chromium-real && \ - echo "**** cleanup ****" && \ - pacman -Rsn --noconfirm \ - git \ - $(pacman -Qdtq) && \ - rm -rf \ - /tmp/* \ - /var/cache/pacman/pkg/* \ - /var/lib/pacman/sync/* - -# add local files -COPY /root / - -# ports and volumes -EXPOSE 3000 - -VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index 8900d10..8b687dc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/wps-office' PR_DOCKERHUB_IMAGE = 'lspipepr/wps-office' DIST_IMAGE = 'arch' - MULTIARCH = 'true' + MULTIARCH = 'false' CI = 'true' CI_WEB = 'true' CI_PORT = '3000' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index ae43f2f..db2a562 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -16,7 +16,7 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/wps-office' - PR_DOCKERHUB_IMAGE = 'lspipepr/wps-office' - DIST_IMAGE = 'arch' - - MULTIARCH = 'true' + - MULTIARCH = 'false' - CI = 'true' - CI_WEB = 'true' - CI_PORT = '3000'