diff --git a/Dockerfile.alpine b/Dockerfile.alpine deleted file mode 100644 index 42fe590..0000000 --- a/Dockerfile.alpine +++ /dev/null @@ -1,5 +0,0 @@ -FROM alpine:latest -RUN apk add guix -RUN mkdir -p ${HOME}/.config/guix -RUN echo "(cons (channel (name 'snow-fort) (url \"https://gitea.scheme.org/Rinne/snow-fort-guix-channel.git\")) %default-channels)" > ${HOME}/.config/guix/channels.scm -RUN guix-daemon & guix pull diff --git a/Dockerfile.debian b/Dockerfile.debian deleted file mode 100644 index ba13392..0000000 --- a/Dockerfile.debian +++ /dev/null @@ -1,5 +0,0 @@ -FROM debian:stable-slim -RUN apt update && apt install -y guix -RUN mkdir -p ${HOME}/.config/guix -RUN echo "(cons (channel (name 'snow-fort) (url \"https://gitea.scheme.org/Rinne/snow-fort-guix-channel.git\")) %default-channels)" > ${HOME}/.config/guix/channels.scm -RUN guix-daemon & guix pull diff --git a/Makefile b/Makefile index d8e0895..a5cc48e 100644 --- a/Makefile +++ b/Makefile @@ -3,19 +3,13 @@ TMPDIR=/tmp/snow-fort-guix-channel build: repo.scm mkdir -p ${TMPDIR}/hashes ./get-package-urls > ${TMPDIR}/package-urls.txt - sh ensure-hashes.sh ${TMPDIR}/hashes ${TMPDIR}/package-urls.txt + ./ensure-hashes ${TMPDIR}/hashes ${TMPDIR}/package-urls.txt mkdir -p packages ./build-repo ${TMPDIR} repo.scm: wget https://snow-fort.org/s/repo.scm -test-debian: - docker build . -f Dockerfile.debian - -test-alpine: - docker build . -f Dockerfile.alpine - clean: rm -rf packages diff --git a/ensure-hashes.sh b/ensure-hashes old mode 100644 new mode 100755 similarity index 92% rename from ensure-hashes.sh rename to ensure-hashes index 4c126cd..e12ea4e --- a/ensure-hashes.sh +++ b/ensure-hashes @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh TMPDIR=${1}