From e15c47f7622dc1201afca5b4091bb8dc0aae0963 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 4 Mar 2022 08:22:57 -0500
Subject: [PATCH] Reproducible build: Bump to Rust 1.59 and Alpine 3.15

The Rust upgrade is necessary since our Cargo.lock file now requires
`ed25519` 1.4.0, which requires edition2021, which requires Rust
1.56 or later.

The Alpine upgrade is opportunistic: we might as well.

I've also added comments to remind us to keep the .gitlab-ci.yml
and docker_reproducible_build files in sync, since my first version
of this commit messed that up.

Closes #376.
---
 .gitlab-ci.yml                  | 3 ++-
 maint/docker_reproducible_build | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8868eef3..981e00b69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,7 +115,8 @@ build-repro:
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG != null
   stage: build
-  image: rust:1.54.0-alpine3.14
+  # If you upgrade this image, also change the one in docker_reproducible_build
+  image: rust:1.59.0-alpine3.15
   script:
     - ./maint/reproducible_build linux windows macos
   artifacts:
diff --git a/maint/docker_reproducible_build b/maint/docker_reproducible_build
index 426f456c5..8c4177892 100755
--- a/maint/docker_reproducible_build
+++ b/maint/docker_reproducible_build
@@ -6,6 +6,9 @@
 ## use a fixed image to not suffer from image retaging when newer rustc or
 ## alpine emerges. Increase shm size for the reasons described in
 ## reproducible_build
+##
+## If you change this image, make sure also to change the one listed in
+## the build-repro job in .gitlab-ci.yml
 exec docker run --rm -i -v "$(git rev-parse --show-toplevel)":/builds/arti \
-		-w /builds/arti --shm-size=512m rust:1.54.0-alpine3.14 \
+		-w /builds/arti --shm-size=512m rust:1.59.0-alpine3.15 \
 		./maint/reproducible_build "$@"