arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 04:18:10 +00:00
Code Issues Releases Wiki Activity

chore(ci): update alpine-linux to 3.15.0 and nix to 2.4

Browse Source
This commit is contained in:
Pavol Rusnak 2021-12-07 17:13:02 +01:00
parent 911dbf0522
commit aa4ade59dc
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build-docker.sh
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="a5de8f89f3851d929704feafda9ff0d7402ae138176bba8b3f6a25ecbb0b8f46" ALPINE_CHECKSUM="1be50ae27c8463d005c4de16558d239e11a88ac6b2f8721c47e660fbeead69bf"
;; ;;
x86_64) x86_64)
ALPINE_CHECKSUM="4591f811a5515b13d60ab76f78bb8fd1cb9d9857a98cf7e2e5b200e89701e62c" ALPINE_CHECKSUM="ec7ec80a96500f13c189a6125f2dbe8600ef593b87fc4670fe959dc02db727a2"
;; ;;
*) *)
exit exit
@ -34,10 +34,10 @@ 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.15}
ALPINE_VERSION=${ALPINE_VERSION:-3.14.2} ALPINE_VERSION=${ALPINE_VERSION:-3.15.0}
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.15} NIX_VERSION=${NIX_VERSION:-2.4}
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)

4
ci/Dockerfile
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.2 ARG ALPINE_VERSION=3.15.0
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.15 ARG NIX_VERSION=2.4
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 \

8
ci/environment.yml
View File

@ -5,11 +5,11 @@ environment:
variables: variables:
GIT_SUBMODULE_STRATEGY: none # no need to fetch submodules GIT_SUBMODULE_STRATEGY: none # no need to fetch submodules
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.15"
ALPINE_ARCH: "x86_64" ALPINE_ARCH: "x86_64"
ALPINE_VERSION: "3.14.2" ALPINE_VERSION: "3.15.0"
ALPINE_CHECKSUM: "4591f811a5515b13d60ab76f78bb8fd1cb9d9857a98cf7e2e5b200e89701e62c" ALPINE_CHECKSUM: "ec7ec80a96500f13c189a6125f2dbe8600ef593b87fc4670fe959dc02db727a2"
NIX_VERSION: "2.3.15" NIX_VERSION: "2.4"
services: services:
- docker:dind - docker:dind
before_script: before_script: