diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 1c532caf..83866953 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,9 +1,10 @@ -FROM golang:1.16.2-alpine3.12 +FROM opensuse/leap ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH -RUN apk -U add bash git gcc musl-dev docker vim less file curl wget ca-certificates make +RUN zypper ref +RUN zypper in -y bash git gcc docker vim less file curl wget ca-certificates make mkisofs go1.16 RUN go get golang.org/x/tools/cmd/goimports RUN if [ "${ARCH}" == "amd64" ]; then \ curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.40.1; \ diff --git a/scripts/package b/scripts/package index 8d6370f8..1ad67d4a 100755 --- a/scripts/package +++ b/scripts/package @@ -28,8 +28,12 @@ fi export GIT_COMMIT=${COMMIT} make -j8 ${TARGETS} +isoinfo -x /rootfs.squashfs -R -i build/output.iso > build/output.squashfs +isoinfo -x /boot/kernel.xz -R -i build/output.iso > build/output-kernel +isoinfo -x /boot/rootfs.xz -R -i build/output.iso > build/output-initrd + mkdir -p dist/artifacts -for i in build/output.*; do +for i in build/output*; do mv -f $i dist/artifacts/rancheros-${TAG}${i##build/output} echo Built: dist/artifacts/rancheros-${TAG}${i##build/output} done