diff --git a/.travis.yml b/.travis.yml index 316ea6d..9f4ff98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,10 +48,9 @@ before_script: - sudo mv daemon.json /etc/docker/daemon.json - sudo systemctl restart docker - docker version - - sh -c 'while true; do echo "."; sleep 300; done' & + - sh -c 'while true; do echo "."; sleep 60; done' & - TRAVIS_POLL=$! - - docker build --platform=local -o . git://github.com/docker/buildx > logs 2>&1 - - tail -n 500 logs + - docker build --platform=local -o . git://github.com/docker/buildx > /dev/null 2>&1 - kill -9 ${TRAVIS_POLL} - mkdir -p ~/.docker/cli-plugins/ - mv buildx ~/.docker/cli-plugins/docker-buildx @@ -59,9 +58,8 @@ before_script: # Run the build and packaging and upload the built images to DockerHub script: - docker buildx create --use --name insecure-builder --buildkitd-flags '--allow-insecure-entitlement security.insecure' - - sh -c 'while true; do echo "."; sleep 300; done' & + - sh -c 'while true; do echo "."; sleep 60; done' & - TRAVIS_POLL=$! - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - 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 - - tail -n 500 logs + - 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" . > /dev/null 2>&1 - kill -9 ${TRAVIS_POLL} diff --git a/Dockerfile b/Dockerfile index f3b493e..e76e8ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,8 +67,5 @@ RUN apk add --no-cache --update --virtual .build-deps shadow \ RUN --security=insecure source $GUIX_PROFILE/etc/profile \ && ~root/.config/guix/current/bin/guix-daemon --build-users-group=guixbuild & guix pull -RUN --security=insecure source $GUIX_PROFILE/etc/profile \ - && ~root/.config/guix/current/bin/guix-daemon --build-users-group=guixbuild & guix package -i nss-certs - ENTRYPOINT ["/entry-point.sh"] CMD ["sh"]