From 5dc28fc9606a21ecff7b41086396a5f02de568fe Mon Sep 17 00:00:00 2001 From: viferga Date: Tue, 26 Nov 2019 15:56:16 -0900 Subject: [PATCH] Remove locale and fail only logs. --- .travis.yml | 11 +++-------- Dockerfile | 5 +---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index a99118a..f1773a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,11 +51,8 @@ before_script: - | sh -c 'while true; do echo "."; sleep 60; done' & export TRAVIS_POLL_INSTALL=$! - - | - docker build --platform=local -o . git://github.com/docker/buildx > logs 2>&1 - export INSTALL_RESULT=$? + - docker build --platform=local -o . git://github.com/docker/buildx > /dev/null 2>&1 - kill -9 ${TRAVIS_POLL_INSTALL} - - if [ ! "$INSTALL_RESULT" = "0" ]; then tail -n 500 logs; fi - mkdir -p ~/.docker/cli-plugins/ - mv buildx ~/.docker/cli-plugins/docker-buildx @@ -66,8 +63,6 @@ script: - | sh -c 'while true; do echo "."; sleep 60; done' & export TRAVIS_POLL_BUILD=$! - - | - docker buildx build -t metacall/guix -o type=registry --allow security.insecure --build-arg METACALL_GUIX_VERSION="1.0.1" --build-arg METACALL_GUIX_ARCH="x86_64" . > logs 2>&1 - export BUILD_RESULT=$? + - docker buildx build -t metacall/guix -o type=registry --allow security.insecure --build-arg METACALL_GUIX_VERSION="1.0.1" --build-arg METACALL_GUIX_ARCH="x86_64" . > logs 2>&1 - kill -9 ${TRAVIS_POLL_BUILD} - - if [ ! "$BUILD_RESULT" = "0" ]; then tail -n 500 logs; fi + - tail -n 500 logs diff --git a/Dockerfile b/Dockerfile index b1def0a..8084fc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,10 +36,7 @@ ENV GUIX_PROFILE="/root/.config/guix/current" \ GUIX_LOCPATH="/root/.guix-profile/lib/locale/" \ SSL_CERT_DIR="/root/.guix-profile/etc/ssl/certs" \ GIT_SSL_FILE="/root/.guix-profile/etc/ssl/certs/ca-certificates.crt" \ - GIT_SSL_CAINFO="$GIT_SSL_FILE" \ - LANG="en_US.utf8" \ - LC_ALL="en_US.utf8" \ - LANGUAGE="en_US.utf8" + GIT_SSL_CAINFO="$GIT_SSL_FILE" # Copy entry point COPY scripts/entry-point.sh /entry-point.sh