From 948972727f24fc3e1062a9442047f0dea4e3db50 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 6 Jul 2019 21:08:20 -0700
Subject: [PATCH 1/2] Add buster images

---
 .travis.yml                   |  2 ++
 1.36.0/buster/Dockerfile      | 26 ++++++++++++++++++++++++
 1.36.0/buster/slim/Dockerfile | 37 +++++++++++++++++++++++++++++++++++
 update.sh                     |  2 +-
 4 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 1.36.0/buster/Dockerfile
 create mode 100644 1.36.0/buster/slim/Dockerfile

diff --git a/.travis.yml b/.travis.yml
index 85ab4ce..52307dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ language: bash
 services: docker
 
 env:
+  - VERSION=1.36.0 VARIANT=buster/slim
+  - VERSION=1.36.0 VARIANT=buster
   - VERSION=1.36.0 VARIANT=stretch/slim
   - VERSION=1.36.0 VARIANT=stretch
 
diff --git a/1.36.0/buster/Dockerfile b/1.36.0/buster/Dockerfile
new file mode 100644
index 0000000..305e765
--- /dev/null
+++ b/1.36.0/buster/Dockerfile
@@ -0,0 +1,26 @@
+FROM buildpack-deps:buster
+
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH \
+    RUST_VERSION=1.36.0
+
+RUN set -eux; \
+    dpkgArch="$(dpkg --print-architecture)"; \
+    case "${dpkgArch##*-}" in \
+        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='a46fe67199b7bcbbde2dcbc23ae08db6f29883e260e23899a88b9073effc9076' ;; \
+        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='6af5abbbae02e13a9acae29593ec58116ab0e3eb893fa0381991e8b0934caea1' ;; \
+        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='51862e576f064d859546cca5f3d32297092a850861e567327422e65b60877a1b' ;; \
+        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='91456c3e6b2a3067914b3327f07bc182e2a27c44bff473263ba81174884182be' ;; \
+        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+    esac; \
+    url="https://static.rust-lang.org/rustup/archive/1.18.3/${rustArch}/rustup-init"; \
+    wget "$url"; \
+    echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    chmod +x rustup-init; \
+    ./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION; \
+    rm rustup-init; \
+    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    rustup --version; \
+    cargo --version; \
+    rustc --version;
diff --git a/1.36.0/buster/slim/Dockerfile b/1.36.0/buster/slim/Dockerfile
new file mode 100644
index 0000000..d10e7ee
--- /dev/null
+++ b/1.36.0/buster/slim/Dockerfile
@@ -0,0 +1,37 @@
+FROM debian:buster-slim
+
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH \
+    RUST_VERSION=1.36.0
+
+RUN set -eux; \
+    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='a46fe67199b7bcbbde2dcbc23ae08db6f29883e260e23899a88b9073effc9076' ;; \
+        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='6af5abbbae02e13a9acae29593ec58116ab0e3eb893fa0381991e8b0934caea1' ;; \
+        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='51862e576f064d859546cca5f3d32297092a850861e567327422e65b60877a1b' ;; \
+        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='91456c3e6b2a3067914b3327f07bc182e2a27c44bff473263ba81174884182be' ;; \
+        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+    esac; \
+    url="https://static.rust-lang.org/rustup/archive/1.18.3/${rustArch}/rustup-init"; \
+    wget "$url"; \
+    echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    chmod +x rustup-init; \
+    ./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION; \
+    rm rustup-init; \
+    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    rustup --version; \
+    cargo --version; \
+    rustc --version; \
+    apt-get remove -y --auto-remove \
+        wget \
+        ; \
+    rm -rf /var/lib/apt/lists/*;
diff --git a/update.sh b/update.sh
index 337ca69..180129b 100755
--- a/update.sh
+++ b/update.sh
@@ -29,7 +29,7 @@ for version in "${versions[@]}"; do
     linuxArchCase+=$'        ''*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; '$'\\\n'
     linuxArchCase+=$'    ''esac'
 
-    for variant in jessie stretch; do
+    for variant in stretch buster; do
         if [ -d "$version/$variant" ]; then
             sed -r \
                 -e 's!%%RUST-VERSION%%!'"$version"'!g' \

From 64d9173cb2bfa14cd82457f5470119c17acc7bcd Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@palantir.com>
Date: Mon, 15 Jul 2019 08:19:44 -0400
Subject: [PATCH 2/2] Fix library generation

---
 generate-stackbrew-library.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 407b459..46e32ee 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -60,7 +60,7 @@ for version in "${versions[@]}"; do
 	debianSuite="${debianSuites[$version]:-$defaultDebianSuite}"
 
 	for v in \
-			{stretch,jessie}{,/slim} \
+			{stretch,buster}{,/slim} \
 	; do
 		dir="$version/$v"
 		variant="$(basename "$v")"