Update to 1.1.0, trying to solve bugs and fixing versions properly.

This commit is contained in:
viferga 2020-11-03 12:12:15 -09:00
parent 7106207ca1
commit 2848d101d9
4 changed files with 36 additions and 8 deletions

@ -1,2 +1,3 @@
**
!channels
!scripts

@ -63,6 +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
- docker buildx build -t metacall/guix -o type=registry --allow security.insecure --build-arg METACALL_GUIX_VERSION="1.1.0" --build-arg METACALL_GUIX_ARCH="x86_64" . > logs 2>&1
- kill -9 ${TRAVIS_POLL_BUILD}
- tail -n 500 logs

@ -65,14 +65,18 @@ RUN mkdir -p /gnu/store \
&& source $GUIX_PROFILE/etc/profile \
&& guix archive --authorize < /root/.config/guix/current/share/guix/ci.guix.gnu.org.pub
# Run pull (https://github.com/docker/buildx/blob/master/README.md#--allowentitlement)
RUN --security=insecure /entry-point.sh guix pull
# Copy additional channels
COPY channels/ /root/.config/guix/
# Restart with latest version of the daemon
RUN --security=insecure /entry-point.sh guix gc --optimize \
&& guix gc \
&& guix package --fallback -i \
nss-certs
# Run pull (https://github.com/docker/buildx/blob/master/README.md#--allowentitlement)
# Restart with latest version of the daemon and garbage collect
RUN --security=insecure sh -c '/entry-point.sh guix pull' \
&& sh -c '/entry-point.sh guix gc --optimize && guix gc'
# RUN --security=insecure /entry-point.sh guix gc --optimize \
# && guix gc \
# && guix package --fallback -i \
# nss-certs
# Clean the profile (avoids: https://www.mail-archive.com/help-guix@gnu.org/msg04836.html)
RUN rm -rf /var/guix/profiles/per-user/root/*

23
channels/channels.scm Normal file

@ -0,0 +1,23 @@
; MetaCall Guix by Parra Studios
; Docker image for using Guix in a CI/CD environment.
;
; Copyright (C) 2016 - 2020 Vicente Eduardo Ferrer Garcia <vic798@gmail.com>
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.
;
(list (channel
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit "658d28987fc6c3f01ca04184c04c6252c5a9126a")) ; v1.1.0