From aa4ade59dc41d6355141833f9bead078485742b6 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 7 Dec 2021 17:13:02 +0100
Subject: [PATCH] chore(ci): update alpine-linux to 3.15.0 and nix to 2.4

---
 build-docker.sh    | 10 +++++-----
 ci/Dockerfile      |  4 ++--
 ci/environment.yml |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build-docker.sh b/build-docker.sh
index ed6da5ea5..a77dfbeb4 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -21,10 +21,10 @@ fi
 if [ -z "$ALPINE_CHECKSUM" ]; then
   case "$ALPINE_ARCH" in
     aarch64)
-      ALPINE_CHECKSUM="a5de8f89f3851d929704feafda9ff0d7402ae138176bba8b3f6a25ecbb0b8f46"
+      ALPINE_CHECKSUM="1be50ae27c8463d005c4de16558d239e11a88ac6b2f8721c47e660fbeead69bf"
       ;;
     x86_64)
-      ALPINE_CHECKSUM="4591f811a5515b13d60ab76f78bb8fd1cb9d9857a98cf7e2e5b200e89701e62c"
+      ALPINE_CHECKSUM="ec7ec80a96500f13c189a6125f2dbe8600ef593b87fc4670fe959dc02db727a2"
       ;;
     *)
       exit
@@ -34,10 +34,10 @@ if [ -z "$ALPINE_CHECKSUM" ]; then
 
 CONTAINER_NAME=${CONTAINER_NAME:-trezor-firmware-env.nix}
 ALPINE_CDN=${ALPINE_CDN:-https://dl-cdn.alpinelinux.org/alpine}
-ALPINE_RELEASE=${ALPINE_RELEASE:-3.14}
-ALPINE_VERSION=${ALPINE_VERSION:-3.14.2}
+ALPINE_RELEASE=${ALPINE_RELEASE:-3.15}
+ALPINE_VERSION=${ALPINE_VERSION:-3.15.0}
 ALPINE_TARBALL=${ALPINE_FILE:-alpine-minirootfs-$ALPINE_VERSION-$ALPINE_ARCH.tar.gz}
-NIX_VERSION=${NIX_VERSION:-2.3.15}
+NIX_VERSION=${NIX_VERSION:-2.4}
 CONTAINER_FS_URL=${CONTAINER_FS_URL:-"$ALPINE_CDN/v$ALPINE_RELEASE/releases/$ALPINE_ARCH/$ALPINE_TARBALL"}
 
 VARIANTS_core=(0 1)
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 3b61914e2..77ad8e0e6 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -1,7 +1,7 @@
 # install the latest Alpine linux from scratch
 
 FROM scratch
-ARG ALPINE_VERSION=3.14.2
+ARG ALPINE_VERSION=3.15.0
 ARG ALPINE_ARCH=x86_64
 ADD alpine-minirootfs-${ALPINE_VERSION}-${ALPINE_ARCH}.tar.gz /
 
@@ -12,7 +12,7 @@ RUN apk add --no-cache --update openssl \
   && echo hosts: files dns > /etc/nsswitch.conf
 
 # Download Nix and install it into the system.
-ARG NIX_VERSION=2.3.15
+ARG NIX_VERSION=2.4
 RUN wget https://nixos.org/releases/nix/nix-${NIX_VERSION}/nix-${NIX_VERSION}-${ALPINE_ARCH}-linux.tar.xz \
   && tar xf nix-${NIX_VERSION}-${ALPINE_ARCH}-linux.tar.xz \
   && addgroup -g 30000 -S nixbld \
diff --git a/ci/environment.yml b/ci/environment.yml
index bbd1d4247..f5168de74 100644
--- a/ci/environment.yml
+++ b/ci/environment.yml
@@ -5,11 +5,11 @@ environment:
   variables:
     GIT_SUBMODULE_STRATEGY: none  # no need to fetch submodules
     CONTAINER_NAME: "$CI_REGISTRY/satoshilabs/trezor/trezor-firmware/trezor-firmware-env.nix"
-    ALPINE_RELEASE: "3.14"
+    ALPINE_RELEASE: "3.15"
     ALPINE_ARCH: "x86_64"
-    ALPINE_VERSION: "3.14.2"
-    ALPINE_CHECKSUM: "4591f811a5515b13d60ab76f78bb8fd1cb9d9857a98cf7e2e5b200e89701e62c"
-    NIX_VERSION: "2.3.15"
+    ALPINE_VERSION: "3.15.0"
+    ALPINE_CHECKSUM: "ec7ec80a96500f13c189a6125f2dbe8600ef593b87fc4670fe959dc02db727a2"
+    NIX_VERSION: "2.4"
   services:
     - docker:dind
   before_script: