[librsvg-oci-images] Sync the rustc template dockerfile
- From: Jordan Petridis <jpetridis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg-oci-images] Sync the rustc template dockerfile
- Date: Wed, 12 Sep 2018 11:54:51 +0000 (UTC)
commit ac6ae676f137702feb263aa33994e4bc5939374a
Author: Jordan Petridis <jpetridis gnome org>
Date: Sun Sep 2 15:56:20 2018 +0300
Sync the rustc template dockerfile
rustc/rustc_template | 46 ++++++++++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 20 deletions(-)
---
diff --git a/rustc/rustc_template b/rustc/rustc_template
index 31b0b44..f27f218 100644
--- a/rustc/rustc_template
+++ b/rustc/rustc_template
@@ -1,32 +1,36 @@
-FROM debian:testing
+FROM debian:testing-slim
+# Librsvg deps
RUN apt update -yqq && apt upgrade -yqq && \
apt install -yqq --no-install-recommends \
- gcc make valac curl libpango1.0-dev \
+ gcc make vala curl \
automake autoconf libtool gettext itstool \
libgdk-pixbuf2.0-dev libgirepository1.0-dev \
- gtk-doc-tools git libgtk-3-dev ccache \
- libxml2-dev libcroco3-dev libcairo2-dev \
- ca-certificates gcc libc6-dev wget
+ gtk-doc-tools git libgtk-3-dev libxml2-dev \
+ libcroco3-dev libcairo2-dev libpango1.0-dev
-# Kepp in sync with https://github.com/rust-lang-nursery/docker-rust
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH
+# Kepp in sync with https://github.com/rust-lang-nursery/docker-rust
RUN set -eux; \
- \
-# this "case" statement is generated via "update.sh"
+ apt-get update; \
+ apt-get install -y --no-install-recommends \
+ ca-certificates \
+ gcc \
+ libc6-dev \
+ wget \
+ ; \
dpkgArch="$(dpkg --print-architecture)"; \
- case "${dpkgArch##*-}" in \
- amd64) rustArch='x86_64-unknown-linux-gnu';
rustupSha256='c9837990bce0faab4f6f52604311a19bb8d2cde989bea6a7b605c8e526db6f02' ;; \
- armhf) rustArch='armv7-unknown-linux-gnueabihf';
rustupSha256='297661e121048db3906f8c964999f765b4f6848632c0c2cfb6a1e93d99440732' ;; \
- arm64) rustArch='aarch64-unknown-linux-gnu';
rustupSha256='a68ac2d400409f485cb22756f0b3217b95449884e1ea6fd9b70522b3c0a929b2' ;; \
- i386) rustArch='i686-unknown-linux-gnu';
rustupSha256='27e6109c7b537b92a6c2d45ac941d959606ca26ec501d86085d651892a55d849' ;; \
- *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
- esac; \
- \
- url="https://static.rust-lang.org/rustup/archive/1.11.0/${rustArch}/rustup-init"; \
+ case "${dpkgArch##*-}" in \
+ amd64) rustArch='x86_64-unknown-linux-gnu';
rustupSha256='f69dafcca62fe70d7882113e21bb96a2cbdf4fc4636d25337d6de9191bdec8da' ;; \
+ armhf) rustArch='armv7-unknown-linux-gnueabihf';
rustupSha256='eee969b9fd128e8dc9b4ec44acde46735cf8e612d06495e9d022517849aba2d6' ;; \
+ arm64) rustArch='aarch64-unknown-linux-gnu';
rustupSha256='cdc48b7882582fd8475107a406dd86df85c7d72e5deea99ff8940c8e11531285' ;; \
+ i386) rustArch='i686-unknown-linux-gnu';
rustupSha256='3bad3945452509ac28ba4113e198323daab57488d6885bb31ac30c9eecd88825' ;; \
+ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+ esac; \
+ url="https://static.rust-lang.org/rustup/archive/1.13.0/${rustArch}/rustup-init"; \
wget "$url"; \
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
chmod +x rustup-init; \
@@ -35,6 +39,8 @@ RUN set -eux; \
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
rustup --version; \
cargo --version; \
- rustc --version;
-
-RUN apt clean && rm -rf /var/lib/apt/lists
\ No newline at end of file
+ rustc --version; \
+ apt-get remove -y --auto-remove \
+ wget \
+ ; \
+ rm -rf /var/lib/apt/lists/*;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]