1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 07:28:10 +00:00

chore(ci): update alpine-linux to 3.14.2 and nix to 2.3.15

This commit is contained in:
Martin Milata 2021-09-29 12:59:32 +02:00
parent b03b688f2d
commit 31d6cfb52d
3 changed files with 10 additions and 10 deletions

View File

@ -21,10 +21,10 @@ fi
if [ -z "$ALPINE_CHECKSUM" ]; then if [ -z "$ALPINE_CHECKSUM" ]; then
case "$ALPINE_ARCH" in case "$ALPINE_ARCH" in
aarch64) aarch64)
ALPINE_CHECKSUM="bc541e148463b3dde10fdbb1af8eac4e34706eae8883c6d126263db07a9a9c42" ALPINE_CHECKSUM="a5de8f89f3851d929704feafda9ff0d7402ae138176bba8b3f6a25ecbb0b8f46"
;; ;;
x86_64) x86_64)
ALPINE_CHECKSUM="bcdf5a4e58637b9228f8e474547a3de9ea02a05a5fa68a2495b0657ada7e65f6" ALPINE_CHECKSUM="4591f811a5515b13d60ab76f78bb8fd1cb9d9857a98cf7e2e5b200e89701e62c"
;; ;;
*) *)
exit exit
@ -35,9 +35,9 @@ if [ -z "$ALPINE_CHECKSUM" ]; then
CONTAINER_NAME=${CONTAINER_NAME:-trezor-firmware-env.nix} CONTAINER_NAME=${CONTAINER_NAME:-trezor-firmware-env.nix}
ALPINE_CDN=${ALPINE_CDN:-https://dl-cdn.alpinelinux.org/alpine} ALPINE_CDN=${ALPINE_CDN:-https://dl-cdn.alpinelinux.org/alpine}
ALPINE_RELEASE=${ALPINE_RELEASE:-3.14} ALPINE_RELEASE=${ALPINE_RELEASE:-3.14}
ALPINE_VERSION=${ALPINE_VERSION:-3.14.0} ALPINE_VERSION=${ALPINE_VERSION:-3.14.2}
ALPINE_TARBALL=${ALPINE_FILE:-alpine-minirootfs-$ALPINE_VERSION-$ALPINE_ARCH.tar.gz} ALPINE_TARBALL=${ALPINE_FILE:-alpine-minirootfs-$ALPINE_VERSION-$ALPINE_ARCH.tar.gz}
NIX_VERSION=${NIX_VERSION:-2.3.14} NIX_VERSION=${NIX_VERSION:-2.3.15}
CONTAINER_FS_URL=${CONTAINER_FS_URL:-"$ALPINE_CDN/v$ALPINE_RELEASE/releases/$ALPINE_ARCH/$ALPINE_TARBALL"} CONTAINER_FS_URL=${CONTAINER_FS_URL:-"$ALPINE_CDN/v$ALPINE_RELEASE/releases/$ALPINE_ARCH/$ALPINE_TARBALL"}
VARIANTS_core=(0 1) VARIANTS_core=(0 1)

View File

@ -1,7 +1,7 @@
# install the latest Alpine linux from scratch # install the latest Alpine linux from scratch
FROM scratch FROM scratch
ARG ALPINE_VERSION=3.14.0 ARG ALPINE_VERSION=3.14.2
ARG ALPINE_ARCH=x86_64 ARG ALPINE_ARCH=x86_64
ADD alpine-minirootfs-${ALPINE_VERSION}-${ALPINE_ARCH}.tar.gz / 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 && echo hosts: files dns > /etc/nsswitch.conf
# Download Nix and install it into the system. # Download Nix and install it into the system.
ARG NIX_VERSION=2.3.14 ARG NIX_VERSION=2.3.15
RUN wget https://nixos.org/releases/nix/nix-${NIX_VERSION}/nix-${NIX_VERSION}-${ALPINE_ARCH}-linux.tar.xz \ 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 \ && tar xf nix-${NIX_VERSION}-${ALPINE_ARCH}-linux.tar.xz \
&& addgroup -g 30000 -S nixbld \ && addgroup -g 30000 -S nixbld \

View File

@ -7,9 +7,9 @@ environment:
CONTAINER_NAME: "$CI_REGISTRY/satoshilabs/trezor/trezor-firmware/trezor-firmware-env.nix" CONTAINER_NAME: "$CI_REGISTRY/satoshilabs/trezor/trezor-firmware/trezor-firmware-env.nix"
ALPINE_RELEASE: "3.14" ALPINE_RELEASE: "3.14"
ALPINE_ARCH: "x86_64" ALPINE_ARCH: "x86_64"
ALPINE_VERSION: "3.14.0" ALPINE_VERSION: "3.14.2"
ALPINE_CHECKSUM: "bcdf5a4e58637b9228f8e474547a3de9ea02a05a5fa68a2495b0657aaa7e65f6" ALPINE_CHECKSUM: "4591f811a5515b13d60ab76f78bb8fd1cb9d9857a98cf7e2e5b200e89701e62c"
NIX_VERSION: "2.3.14" NIX_VERSION: "2.3.15"
services: services:
- docker:dind - docker:dind
before_script: before_script: