diff --git a/build-x2t-sandbox-rule.sh b/build-x2t-sandbox-rule.sh index b6d3f57..b2f87f1 100755 --- a/build-x2t-sandbox-rule.sh +++ b/build-x2t-sandbox-rule.sh @@ -3,7 +3,7 @@ set -e buildah bud --format=docker --security-opt label=disable --userns=host --network=host --rm=true --layers=true --memory=0 \ - --tag jcr.jianguoyun.net.cn/onlyoffice/x2t-sandbox-rulegen-builder --file ./build/x2t-snadbox-rulegen-ubuntu.dockerfile . + --tag jcr.jianguoyun.net.cn/onlyoffice/x2t-sandbox-rulegen-builder --file ./build/x2t-sandbox-rulegen-ubuntu.dockerfile . cp -r ./x2t-sandbox-rulegen ./src podman run --rm --security-opt label=disable --network=host \ diff --git a/build-x2t-sandbox.sh b/build-x2t-sandbox.sh index 80d6a84..ff3ca52 100755 --- a/build-x2t-sandbox.sh +++ b/build-x2t-sandbox.sh @@ -3,10 +3,11 @@ set -e buildah bud --format=docker --security-opt label=disable --userns=host --network=host --rm=true --layers=true --memory=0 \ - --tag jcr.jianguoyun.net.cn/onlyoffice/x2r-sandbox-builder --file ./build/x2t-snadbox-ubuntu.dockerfile . + --build-arg BASE_IMAGE=nexus.jianguoyun.net.cn/infra/ubuntu-nutstore:22.04 \ + --tag jcr.jianguoyun.net.cn/onlyoffice/x2t-sandbox-builder --file ./build/x2t-sandbox-ubuntu.dockerfile . podman run --rm --security-opt label=disable --network=host \ --volume .:/app \ --workdir /app/src \ - jcr.jianguoyun.net.cn/onlyoffice/x2r-sandbox-builder \ + jcr.jianguoyun.net.cn/onlyoffice/x2t-sandbox-builder \ bash -c "/root/.cargo/bin/cargo build --release" \ No newline at end of file diff --git a/build/x2t-snadbox-rulegen-ubuntu.dockerfile b/build/x2t-sandbox-rulegen-ubuntu.dockerfile similarity index 100% rename from build/x2t-snadbox-rulegen-ubuntu.dockerfile rename to build/x2t-sandbox-rulegen-ubuntu.dockerfile diff --git a/build/x2t-snadbox-ubuntu.dockerfile b/build/x2t-sandbox-ubuntu.dockerfile similarity index 100% rename from build/x2t-snadbox-ubuntu.dockerfile rename to build/x2t-sandbox-ubuntu.dockerfile