diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 263e2d4..1fcd815 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -59,8 +59,8 @@ jobs: git clone https://github.com/jumpserver/docker-web.git cd docker-web git checkout -b ${{ env.current_branch }} - sed -i 's|jumpserver/web-static:\w+ |jumpserver/web-static:${{ env.IMAGE_TAG }} |' Dockerfile-ee - sed -i 's|jumpserver/web-static:\w+ |jumpserver/web-static:${{ env.IMAGE_TAG }} |' Dockerfile + sed -E -i 's|jumpserver/web-static:\w+ |jumpserver/web-static:${{ env.IMAGE_TAG }} |' Dockerfile-ee + sed -E -i 's|jumpserver/web-static:\w+ |jumpserver/web-static:${{ env.IMAGE_TAG }} |' Dockerfile git add Dockerfile-ee Dockerfile git commit -m "perf: Update web static version" diff --git a/prepare.sh b/prepare.sh index 74c2842..8272f65 100755 --- a/prepare.sh +++ b/prepare.sh @@ -14,7 +14,7 @@ DOWNLOAD_URL=https://download.jumpserver.org mkdir -p /opt/player cd /opt/player || exit 1 wget ${DOWNLOAD_URL}/public/glyptodon-enterprise-player-${PLAY_VERSION}.tar.gz -tar -xf glyptodon-enterprise-player-${PLAY_VERSION}.tar.gz -C ${PROJECT_DIR}/opt/player --strip-components 1 +tar -xf glyptodon-enterprise-player-${PLAY_VERSION}.tar.gz -C /opt/player --strip-components 1 rm -f glyptodon-enterprise-player-${PLAY_VERSION}.tar.gz DOWNLOAD_DIR=/opt/download