apt: Install Rust to build YJIT of Ruby

Signed-off-by: Takuro Ashie <ashie@clear-code.com>
fluent · Jan 17, 2023 · ee80f48 · ee80f48
1 parent 6c37458
commit ee80f48
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: