BuildSourceImage: shell traps

unused so far, but we may likely want some cleanup place

.copr/Makefile

@@ -1 +0,0 @@
-../Makefile

.gitignore

@@ -2,5 +2,3 @@
 .build-container
 .testprep
 .validate
-*.rpm
-x86_64/

BuildSourceImage.sh

@@ -16,8 +16,6 @@ _usage() {
     _version
     echo "Usage: $(basename "$0") [-D] [-b <path>] [-c <path>] [-e <path>] [-r <path>] [-o <path>] [-i <image>] [-p <image>] [-l] [-d <drivers>]"
     echo ""
-    echo "          Container Source Image tool"
-    echo ""
     echo -e "       -b <path>\tbase path for source image builds"
     echo -e "       -c <path>\tbuild context for the container image. Can be provided via CONTEXT_DIR env variable"
     echo -e "       -e <path>\textra src for the container image. Can be provided via EXTRA_SRC_DIR env variable"
@@ -50,6 +48,16 @@ _init() {
     done
 }
 
+cleanup() {
+    local ret=$?
+    if [ ${ret} -ne 0 ] ; then
+        echo ""
+        _warn "cleaning up"
+    fi
+    exit "${ret}"
+}
+trap "cleanup" EXIT TERM KILL
+
 # enable access to some of functions as subcommands!
 _subcommand() {
     local command="${1}"
@@ -130,14 +138,6 @@ _tar() {
     fi
 }
 
-_rpm_download() {
-    if [ "$(command -v yumdownloader)" != "" ] ; then
-        yumdownloader "${@}"
-    else
-        dnf download "${@}"
-    fi
-}
-
 # output things, only when $DEBUG is set
 _debug() {
     if [ -n "${DEBUG}" ] ; then
@@ -851,7 +851,7 @@ sourcedriver_rpm_fetch() {
         rpm=${srcrpm%*.src.rpm}
         if [ ! -f "${out_dir}/${srcrpm}" ] ; then
             _debug "--> fetching ${srcrpm}"
-            _rpm_download \
+            dnf download \
                 --quiet \
                 --installroot "${rootfs}" \
                 --release "${release}" \
@@ -1071,6 +1071,8 @@ main() {
     local unpack_dir
     local work_dir
 
+sleep 10
+
     _init "${@}"
     _subcommand "${@}"
 

BuildSourceImage.spec

@@ -1,43 +0,0 @@
-Name:		BuildSourceImage
-Version:	0.2
-Release:	1%{?dist}
-Summary:	Container Source Image tool
-
-Group:		containers
-License:	GPLv2
-URL:		https://github.com/containers/BuildSourceImage
-Source0:	BuildSourceImage.sh
-
-#BuildRequires:	
-Requires:	jq
-Requires:	skopeo
-Requires:	findutils
-Requires:	file
-%if 0%{?rhel} > 6
-Requires:	yum-utils
-%else
-Requires:	dnf-command(download)
-%endif
-
-%description
-%{summary}.
-
-%prep
-
-
-%build
-
-
-%install
-%{__mkdir_p} %{buildroot}/%{_bindir}
-%{__install} -T -m 0755 ${RPM_SOURCE_DIR}/BuildSourceImage.sh %{buildroot}/%{_bindir}/BuildSourceImage
-
-
-%files
-%doc ${RPM_SOURCE_DIR}/LICENSE ${RPM_SOURCE_DIR}/README.md
-%{_bindir}/BuildSourceImage
-
-
-
-%changelog
-

Makefile

@@ -1,29 +1,14 @@
-pkgname		:= BuildSourceImage
-CTR_IMAGE	:= localhost/containers/buildsourceimage
-CTR_ENGINE	?= podman
-BATS_OPTS	?=
-cleanfiles	=
+SRC := ./BuildSourceImage.sh
+CTR_IMAGE := localhost/containers/buildsourceimage
+CTR_ENGINE ?= podman
+BATS_OPTS ?=
+cleanfiles =
 # these are packages whose src.rpms are very small
-srpm_urls	= \
+srpm_urls = \
 	https://archive.kernel.org/centos-vault/7.0.1406/os/Source/SPackages/basesystem-10.0-7.el7.centos.src.rpm \
 	https://archive.kernel.org/centos-vault/7.0.1406/os/Source/SPackages/rootfiles-8.1-11.el7.src.rpm \
 	https://archive.kernel.org/centos-vault/7.0.1406/os/Source/SPackages/centos-bookmarks-7-1.el7.src.rpm
-srpms		= $(addprefix ./.testprep/srpms/,$(notdir $(rpms)))
-
-spec		?= $(pkgname).spec
-pwd		:= $(shell pwd)
-NAME		:= $(shell rpmspec -q --qf "%{name}" $(spec))
-VERSION		:= $(shell rpmspec -q --qf "%{version}" $(spec))
-RELEASE		:= $(shell rpmspec -q --qf "%{release}" $(spec))
-ARCH		:= $(shell rpmspec -q --qf "%{arch}" $(spec))
-NVR		:= $(NAME)-$(VERSION)-$(RELEASE)
-outdir		?= $(pwd)
-
-SHELL_SRC		:= ./BuildSourceImage.sh
-DIST_FILES		:= \
-	$(SHELL_SRC) \
-	LICENSE \
-	README.md
+srpms = $(addprefix ./.testprep/srpms/,$(notdir $(rpms)))
 
 export CTR_IMAGE
 export CTR_ENGINE
@@ -33,13 +18,13 @@ all: validate
 validate: .validate
 
 cleanfiles += .validate
-.validate: $(SHELL_SRC)
-	shellcheck $(SHELL_SRC) && touch $@
+.validate: $(SRC)
+	shellcheck $(SRC) && touch $@
 
 build-container: .build-container
 
 cleanfiles += .build-container
-.build-container: .validate Dockerfile $(SHELL_SRC)
+.build-container: .validate Dockerfile $(SRC)
 	@echo
 	@echo "==> Building BuildSourceImage Container"
 	$(CTR_ENGINE) build --quiet --file Dockerfile --tag $(CTR_IMAGE) . && touch $@
@@ -56,34 +41,6 @@ test-integration: .build-container .testprep
 	@echo "==> Running integration tests"
 	TMPDIR=$(realpath .testprep/tmp) bats $(BATS_OPTS) test/
 
-.PHONY: srpm
-srpm: $(NVR).src.rpm
-	@echo $^
-
-cleanfiles += $(NVR).src.rpm
-$(NVR).src.rpm: $(spec) $(DIST_FILES)
-	rpmbuild \
-                --define '_sourcedir $(pwd)' \
-                --define '_specdir $(pwd)' \
-                --define '_builddir $(pwd)' \
-                --define '_srcrpmdir $(outdir)' \
-                --define '_rpmdir $(outdir)' \
-                --nodeps \
-                -bs ./$(spec)
-
-.PHONY: rpm
-rpm: $(ARCH)/$(NVR).$(ARCH).rpm
-	@echo $^
-
-cleanfiles += $(ARCH)/$(NVR).$(ARCH).rpm
-$(ARCH)/$(NVR).$(ARCH).rpm: $(spec) $(DIST_FILES)
-	rpmbuild \
-                --define '_sourcedir $(pwd)' \
-                --define '_specdir $(pwd)' \
-                --define '_builddir $(pwd)' \
-                --define '_srcrpmdir $(outdir)' \
-                --define '_rpmdir $(outdir)' \
-                -bb ./$(spec)
 
 clean:
 	if [ -n "$(cleanfiles)" ] ; then rm -rf $(cleanfiles) ; fi

README.md

@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/containers/BuildSourceImage.svg?branch=master)](https://travis-ci.org/containers/BuildSourceImage)
-[![Container Image Repository on Quay](https://quay.io/repository/ctrs/bsi/status "Container Image Repository on Quay")](https://quay.io/repository/ctrs/bsi)
+[![Container Image Repository on Quay](https://quay.io/repository/vbatts/bsi/status "Container Image Repository on Quay")](https://quay.io/repository/vbatts/bsi)
 
 # BuildSourceImage
 
@@ -32,8 +32,9 @@ Usage: BuildSourceImage.sh [-D] [-b <path>] [-c <path>] [-e <path>] [-r <path>]
 Nicely usable inside a container:
 
 ```bash
+$> podman build -t containers/buildsourceimage .
 $> mkdir ./output/
-$> podman run -it -v $(pwd)/output/:/output/ -v $(pwd)/SRCRPMS/:/data/ -u $(id -u) quay.io/ctrs/bsi -s /data/ -o /output/
+$> podman run -it -v $(pwd)/output/:/output/ -v $(pwd)/SRCRPMS/:/data/ -u $(id -u) containers/buildsourceimage -s /data/
 ```
 
 ## Examples