diff --git a/td-agent/apt/debian-bullseye/Dockerfile b/td-agent/apt/debian-bullseye/Dockerfile index d3555c4ab..065cf3398 100644 --- a/td-agent/apt/debian-bullseye/Dockerfile +++ b/td-agent/apt/debian-bullseye/Dockerfile @@ -57,4 +57,5 @@ RUN \ sed -i'' -e 's,#precedence ::ffff:0:0/96 100,precedence ::ffff:0:0/96 100,' /etc/gai.conf && \ # enable multiplatform feature gem install --no-document --install-dir /usr/share/rubygems-integration/all bundler builder && \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* && \ + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y diff --git a/td-agent/apt/debian-buster/Dockerfile b/td-agent/apt/debian-buster/Dockerfile index 2beff7a91..5bae66b27 100644 --- a/td-agent/apt/debian-buster/Dockerfile +++ b/td-agent/apt/debian-buster/Dockerfile @@ -58,4 +58,5 @@ RUN \ # enable multiplatform feature gem install --no-document --install-dir /usr/share/rubygems-integration/all bundler --version 2.3.26 && \ gem install --no-document --install-dir /usr/share/rubygems-integration/all builder && \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* && \ + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y diff --git a/td-agent/apt/ubuntu-bionic/Dockerfile b/td-agent/apt/ubuntu-bionic/Dockerfile index 11d655b49..3c20e5cba 100644 --- a/td-agent/apt/ubuntu-bionic/Dockerfile +++ b/td-agent/apt/ubuntu-bionic/Dockerfile @@ -62,4 +62,5 @@ RUN \ # enable multiplatform feature gem install --no-document bundler --version 2.3.26 && \ gem install --no-document builder && \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* && \ + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y diff --git a/td-agent/apt/ubuntu-focal/Dockerfile b/td-agent/apt/ubuntu-focal/Dockerfile index a2cbbba83..830fa96cc 100644 --- a/td-agent/apt/ubuntu-focal/Dockerfile +++ b/td-agent/apt/ubuntu-focal/Dockerfile @@ -56,4 +56,5 @@ RUN \ sed -i'' -e 's,#precedence ::ffff:0:0/96 100,precedence ::ffff:0:0/96 100,' /etc/gai.conf && \ # enable multiplatform feature gem install --no-document --install-dir /usr/share/rubygems-integration/all bundler builder && \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* && \ + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y diff --git a/td-agent/apt/ubuntu-jammy/Dockerfile b/td-agent/apt/ubuntu-jammy/Dockerfile index ea44d62e0..a717f4c00 100644 --- a/td-agent/apt/ubuntu-jammy/Dockerfile +++ b/td-agent/apt/ubuntu-jammy/Dockerfile @@ -56,4 +56,5 @@ RUN \ sed -i'' -e 's,#precedence ::ffff:0:0/96 100,precedence ::ffff:0:0/96 100,' /etc/gai.conf && \ # enable multiplatform feature gem install --no-document --install-dir /usr/share/rubygems-integration/all bundler builder && \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* && \ + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y diff --git a/td-agent/debian/rules b/td-agent/debian/rules index 2f9597697..c1cabec1c 100755 --- a/td-agent/debian/rules +++ b/td-agent/debian/rules @@ -13,7 +13,7 @@ override_dh_builddeb: override_dh_auto_install: rake build:deb_config TD_AGENT_STAGING_PATH="$(CURDIR)/debian/tmp" NO_VAR_RUN=1 - rake build:all TD_AGENT_STAGING_PATH="$(CURDIR)/debian/tmp" + rake build:all TD_AGENT_STAGING_PATH="$(CURDIR)/debian/tmp" PATH="$(HOME)/.cargo/bin:$(PATH)" dh_installman override_dh_auto_clean: