From e1137b8aa254d2f956d3f522dd4e497b0a6a8944 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sun, 3 Dec 2017 10:55:00 -0800 Subject: [PATCH] Add beta images Closes #14 --- .travis.yml | 2 ++ 1.23.0-beta.1/jessie/Dockerfile | 28 ++++++++++++++++++++++++++++ 1.23.0-beta.1/release-architectures | 7 +++++++ 1.23.0-beta.1/rustup-version | 1 + 1.23.0-beta.1/stretch/Dockerfile | 28 ++++++++++++++++++++++++++++ generate-stackbrew-library.sh | 3 ++- 6 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 1.23.0-beta.1/jessie/Dockerfile create mode 100644 1.23.0-beta.1/release-architectures create mode 100644 1.23.0-beta.1/rustup-version create mode 100644 1.23.0-beta.1/stretch/Dockerfile diff --git a/.travis.yml b/.travis.yml index 2e803c3..1d2b5b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: bash services: docker env: + - VERSION=1.23.0-beta.1 VARIANT=stretch + - VERSION=1.23.0-beta.1 VARIANT=jessie - VERSION=1.22.1 VARIANT=stretch - VERSION=1.22.1 VARIANT=jessie diff --git a/1.23.0-beta.1/jessie/Dockerfile b/1.23.0-beta.1/jessie/Dockerfile new file mode 100644 index 0000000..e67d68e --- /dev/null +++ b/1.23.0-beta.1/jessie/Dockerfile @@ -0,0 +1,28 @@ +FROM buildpack-deps:jessie + +ENV RUSTUP_HOME=/usr/local/rustup \ + CARGO_HOME=/usr/local/cargo \ + PATH=/usr/local/cargo/bin:$PATH + +RUN set -eux; \ + \ +# this "case" statement is generated via "update.sh" + dpkgArch="$(dpkg --print-architecture)"; \ + case "${dpkgArch##*-}" in \ + amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='5a38dbaf7ab2e4335a3dfc42698a5b15e7167c93b0b06fc95f53c1da6379bf1a' ;; \ + armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='f7ffec8a9cfe3096d535576e79cbd501766fda3769e9ed755cf1f18d7a3ba49c' ;; \ + arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='bc513fbd0d221166d3aa612907016d417f8642448d1727c1446876ec9326ab2c' ;; \ + i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='82b7ca05ce20e7b8f8dff4a406ef3610d21feb1476fa6fd8959355ac11474ce5' ;; \ + *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ + esac; \ + \ + url="https://static.rust-lang.org/rustup/archive/1.7.0/${rustArch}/rustup-init"; \ + wget "$url"; \ + echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ + chmod +x rustup-init; \ + ./rustup-init -y --no-modify-path --default-toolchain 1.23.0-beta.1; \ + rm rustup-init; \ + chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ + rustup --version; \ + cargo --version; \ + rustc --version; diff --git a/1.23.0-beta.1/release-architectures b/1.23.0-beta.1/release-architectures new file mode 100644 index 0000000..5a79b87 --- /dev/null +++ b/1.23.0-beta.1/release-architectures @@ -0,0 +1,7 @@ +# see https://github.com/rust-lang-nursery/rustup.rs#other-installation-methods + +# bashbrew-arch dpkg-arch rust-arch +amd64 amd64 x86_64-unknown-linux-gnu +arm32v7 armhf armv7-unknown-linux-gnueabihf +arm64v8 arm64 aarch64-unknown-linux-gnu +i386 i386 i686-unknown-linux-gnu diff --git a/1.23.0-beta.1/rustup-version b/1.23.0-beta.1/rustup-version new file mode 100644 index 0000000..bd8bf88 --- /dev/null +++ b/1.23.0-beta.1/rustup-version @@ -0,0 +1 @@ +1.7.0 diff --git a/1.23.0-beta.1/stretch/Dockerfile b/1.23.0-beta.1/stretch/Dockerfile new file mode 100644 index 0000000..864ebc2 --- /dev/null +++ b/1.23.0-beta.1/stretch/Dockerfile @@ -0,0 +1,28 @@ +FROM buildpack-deps:stretch + +ENV RUSTUP_HOME=/usr/local/rustup \ + CARGO_HOME=/usr/local/cargo \ + PATH=/usr/local/cargo/bin:$PATH + +RUN set -eux; \ + \ +# this "case" statement is generated via "update.sh" + dpkgArch="$(dpkg --print-architecture)"; \ + case "${dpkgArch##*-}" in \ + amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='5a38dbaf7ab2e4335a3dfc42698a5b15e7167c93b0b06fc95f53c1da6379bf1a' ;; \ + armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='f7ffec8a9cfe3096d535576e79cbd501766fda3769e9ed755cf1f18d7a3ba49c' ;; \ + arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='bc513fbd0d221166d3aa612907016d417f8642448d1727c1446876ec9326ab2c' ;; \ + i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='82b7ca05ce20e7b8f8dff4a406ef3610d21feb1476fa6fd8959355ac11474ce5' ;; \ + *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ + esac; \ + \ + url="https://static.rust-lang.org/rustup/archive/1.7.0/${rustArch}/rustup-init"; \ + wget "$url"; \ + echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ + chmod +x rustup-init; \ + ./rustup-init -y --no-modify-path --default-toolchain 1.23.0-beta.1; \ + rm rustup-init; \ + chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ + rustup --version; \ + cargo --version; \ + rustc --version; diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index cef9ade..6e7176d 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,7 +2,8 @@ set -Eeuo pipefail declare -A aliases=( - [1.22.1]='1 1.22 latest' + [1.22.1]='1 1.22 stable latest' + [1.23.0-beta.1]='1.23.0-beta beta' ) defaultDebianSuite='stretch'