mirror of
https://github.com/trezor/trezor-firmware.git
synced 2025-01-17 19:00:58 +00:00
ci: drop experimental --platform argument from docker
This commit is contained in:
parent
1006c8a0f1
commit
250f09245b
@ -16,7 +16,7 @@ PRODUCTION=${PRODUCTION:-1}
|
|||||||
MEMORY_PROTECT=${MEMORY_PROTECT:-1}
|
MEMORY_PROTECT=${MEMORY_PROTECT:-1}
|
||||||
|
|
||||||
wget --no-config -nc -P ci/ "$CONTAINER_FS_URL"
|
wget --no-config -nc -P ci/ "$CONTAINER_FS_URL"
|
||||||
docker build --platform "linux/$ALPINE_ARCH" --build-arg ALPINE_VERSION="$ALPINE_VERSION" --build-arg ALPINE_ARCH="$ALPINE_ARCH" -t "$CONTAINER_NAME" ci/
|
docker build --build-arg ALPINE_VERSION="$ALPINE_VERSION" --build-arg ALPINE_ARCH="$ALPINE_ARCH" -t "$CONTAINER_NAME" ci/
|
||||||
|
|
||||||
# stat under macOS has slightly different cli interface
|
# stat under macOS has slightly different cli interface
|
||||||
USER=$(stat -c "%u" . 2>/dev/null || stat -f "%u" .)
|
USER=$(stat -c "%u" . 2>/dev/null || stat -f "%u" .)
|
||||||
@ -54,7 +54,7 @@ for BITCOIN_ONLY in 0 1; do
|
|||||||
chown -R $USER:$GROUP /build
|
chown -R $USER:$GROUP /build
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
docker run --platform "linux/$ALPINE_ARCH" -it --rm \
|
docker run -it --rm \
|
||||||
-v "$DIR:/local" \
|
-v "$DIR:/local" \
|
||||||
-v "$DIR/build/core$DIRSUFFIX":/build:z \
|
-v "$DIR/build/core$DIRSUFFIX":/build:z \
|
||||||
--env BITCOIN_ONLY="$BITCOIN_ONLY" \
|
--env BITCOIN_ONLY="$BITCOIN_ONLY" \
|
||||||
@ -94,7 +94,7 @@ for BITCOIN_ONLY in 0 1; do
|
|||||||
chown -R $USER:$GROUP /build
|
chown -R $USER:$GROUP /build
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
docker run --platform "linux/$ALPINE_ARCH" -it --rm \
|
docker run -it --rm \
|
||||||
-v "$DIR:/local" \
|
-v "$DIR:/local" \
|
||||||
-v "$DIR/build/legacy$DIRSUFFIX":/build:z \
|
-v "$DIR/build/legacy$DIRSUFFIX":/build:z \
|
||||||
--env BITCOIN_ONLY="$BITCOIN_ONLY" \
|
--env BITCOIN_ONLY="$BITCOIN_ONLY" \
|
||||||
|
@ -14,6 +14,6 @@ environment:
|
|||||||
- docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
|
- docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
|
||||||
script:
|
script:
|
||||||
- wget -nc -P ci/ http://dl-cdn.alpinelinux.org/alpine/v$ALPINE_RELEASE/releases/$ALPINE_ARCH/alpine-minirootfs-$ALPINE_VERSION-$ALPINE_ARCH.tar.gz
|
- wget -nc -P ci/ http://dl-cdn.alpinelinux.org/alpine/v$ALPINE_RELEASE/releases/$ALPINE_ARCH/alpine-minirootfs-$ALPINE_VERSION-$ALPINE_ARCH.tar.gz
|
||||||
- docker build --tag $CONTAINER_NAME:$CI_COMMIT_SHA --tag $CONTAINER_NAME:latest --platform "linux/$ALPINE_ARCH" --build-arg ALPINE_VERSION="$ALPINE_VERSION" --build-arg ALPINE_ARCH="$ALPINE_ARCH" --build-arg FULLDEPS_TESTING=1 ci/
|
- docker build --tag $CONTAINER_NAME:$CI_COMMIT_SHA --tag $CONTAINER_NAME:latest --build-arg ALPINE_VERSION="$ALPINE_VERSION" --build-arg ALPINE_ARCH="$ALPINE_ARCH" --build-arg FULLDEPS_TESTING=1 ci/
|
||||||
- docker push $CONTAINER_NAME:$CI_COMMIT_SHA
|
- docker push $CONTAINER_NAME:$CI_COMMIT_SHA
|
||||||
- docker push $CONTAINER_NAME:latest
|
- docker push $CONTAINER_NAME:latest
|
||||||
|
Loading…
Reference in New Issue
Block a user