diff --git a/.github/workflows/build-test-ubuntu-arm64.yml b/.github/workflows/build-test-ubuntu-arm64.yml index b084c711a..f2c761c8e 100644 --- a/.github/workflows/build-test-ubuntu-arm64.yml +++ b/.github/workflows/build-test-ubuntu-arm64.yml @@ -26,13 +26,13 @@ jobs: - name: Pull custom ARM64 Docker image run: | - docker pull --platform linux/arm64 kcllang/kcl-builder-arm64 + docker pull --platform linux/arm64 ghcr.io/kcl-lang/kcl-builder-arm64 - name: Build in Docker run: | docker run --rm --platform linux/arm64 \ -v ${{ github.workspace }}:/workspace -w /workspace \ - kcllang/kcl-builder-arm64 \ + ghcr.io/kcl-lang/kcl-builder-arm64 \ /bin/bash -c "export KCL_BUILD_GIT_SHA=$(git rev-parse HEAD) && git config --global --add safe.directory /workspace && git config --global user.name 'GitHub Action' && git config --global user.email 'action@github.com' && make && make release && _build/dist/linux/kclvm/bin/kclvm_cli version" - name: Read VERSION file diff --git a/scripts/docker/kcl-builder-alpine/Dockerfile b/scripts/docker/kcl-builder-alpine/Dockerfile index 5bc9f3f80..08c85f69e 100644 --- a/scripts/docker/kcl-builder-alpine/Dockerfile +++ b/scripts/docker/kcl-builder-alpine/Dockerfile @@ -28,7 +28,7 @@ ENV GOPATH=/go \ CARGO_NET_GIT_FETCH_WITH_CLI=true # install rust and cargo -RUN wget -qO- https://sh.rustup.rs | sh -s -- -y \ +RUN wget -qO- https://sh.rustup.rs | bash -s -- -y --default-toolchain 1.83.0 \ && echo 'source $HOME/.cargo/env' >> $HOME/.ashrc \ && . $HOME/.cargo/env \ && cargo version \ diff --git a/scripts/docker/kcl-builder-arm64/Dockerfile b/scripts/docker/kcl-builder-arm64/Dockerfile index d9a0ed963..640e70244 100644 --- a/scripts/docker/kcl-builder-arm64/Dockerfile +++ b/scripts/docker/kcl-builder-arm64/Dockerfile @@ -1,5 +1,5 @@ # Copyright The KCL Authors. All rights reserved. -# Builder for kcllang/kcl-builder-arm64 image +# Builder for ghcr.io/kcl-lang/kcl-builder-arm64 image FROM arm64v8/ubuntu:20.04 @@ -12,7 +12,7 @@ RUN apt-get install -y curl make gcc git zlib1g-dev RUN apt install -y pkg-config libssl-dev # rust -RUN curl https://sh.rustup.rs -sSf | bash -s -- -y +RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.83.0 ENV CARGO_NET_GIT_FETCH_WITH_CLI=true RUN cargo version diff --git a/scripts/docker/kcl-builder-centos7/Dockerfile b/scripts/docker/kcl-builder-centos7/Dockerfile index b860b965f..bf5ed977b 100644 --- a/scripts/docker/kcl-builder-centos7/Dockerfile +++ b/scripts/docker/kcl-builder-centos7/Dockerfile @@ -44,7 +44,7 @@ RUN yum install -y wget # rust # https://www.rust-lang.org/tools/install -RUN curl https://sh.rustup.rs -sSf | bash -s -- -y +RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.83.0 ENV PATH="/root/.cargo/bin:${PATH}" ENV CARGO_NET_GIT_FETCH_WITH_CLI=true diff --git a/scripts/docker/kcl-builder-centos8/Dockerfile b/scripts/docker/kcl-builder-centos8/Dockerfile index 92edb3d11..72e0125b5 100644 --- a/scripts/docker/kcl-builder-centos8/Dockerfile +++ b/scripts/docker/kcl-builder-centos8/Dockerfile @@ -23,7 +23,7 @@ RUN yum -y install ca-certificates # rust-1.54.0 # cargo 1.54.0 # RUN yum -y install rust cargo rustfmt -RUN curl https://sh.rustup.rs -sSf | bash -s -- -y +RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.83.0 RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc ENV PATH="/root/.cargo/bin:${PATH}" diff --git a/scripts/docker/kcl-builder-fedora39/Dockerfile b/scripts/docker/kcl-builder-fedora39/Dockerfile index 1d0245437..2d1e52c2e 100644 --- a/scripts/docker/kcl-builder-fedora39/Dockerfile +++ b/scripts/docker/kcl-builder-fedora39/Dockerfile @@ -13,7 +13,7 @@ RUN sed -i -e "s|#baseurl=http://download.example/pub/fedora/linux|baseurl=https RUN dnf -y install make which wget git ca-certificates clang llvm-devel libffi-devel python3-devel # rust -RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \ +RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.83.0 echo 'source $HOME/.cargo/env' >> $HOME/.bashrc ENV PATH="/root/.cargo/bin:${PATH}" ENV CARGO_NET_GIT_FETCH_WITH_CLI=true diff --git a/scripts/docker/kcl-builder/Dockerfile b/scripts/docker/kcl-builder/Dockerfile index b79efa091..c5223cd49 100644 --- a/scripts/docker/kcl-builder/Dockerfile +++ b/scripts/docker/kcl-builder/Dockerfile @@ -1,6 +1,6 @@ # Copyright The KCL Authors. All rights reserved. -FROM ubuntu:22.04 +FROM ghcr.io/zong-zhe/ubuntu:22.04 #RUN uname -a #RUN cat /etc/os-release @@ -28,7 +28,7 @@ RUN ln -sf /usr/local/python3.9/bin/python3.9 /usr/bin/python3.9 # rust # https://www.rust-lang.org/tools/install -RUN curl https://sh.rustup.rs -sSf | bash -s -- -y +RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.83.0 ENV PATH="/root/.cargo/bin:${PATH}" ENV CARGO_NET_GIT_FETCH_WITH_CLI=true @@ -49,7 +49,6 @@ RUN mkdir -p /root/download && cd /root/download \ && tar -zxvf go1.20.5.linux-amd64.tar.gz \ && mv ./go /usr/local/go1.20.5 RUN ln -sf /usr/local/go1.20.5/bin/go /usr/bin/go -RUN rm -rf /root/download ENV GOPATH=/go ENV GOLANG_VERSION=1.20.5