working commit

Makefile.in

@@ -101,7 +101,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = app/config/variant.go initrc/mstored.service \
-	initrc/mstored
+	initrc/mstored chart/Chart.yaml chart/values.yaml
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
@@ -165,6 +165,8 @@ am__define_uniq_tagged_files = \
 AM_RECURSIVE_TARGETS = cscope
 am__DIST_COMMON = $(srcdir)/Makefile.in \
 	$(top_srcdir)/app/config/variant.go.in \
+	$(top_srcdir)/chart/Chart.yaml.in \
+	$(top_srcdir)/chart/values.yaml.in \
 	$(top_srcdir)/initrc/mstored.in \
 	$(top_srcdir)/initrc/mstored.service.in README.md config.guess \
 	config.sub install-sh missing
@@ -194,7 +196,9 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASENAME = @BASENAME@
 CP = @CP@
+CPIO = @CPIO@
 CSCOPE = @CSCOPE@
 CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -206,6 +210,7 @@ ETAGS = @ETAGS@
 FIND = @FIND@
 GO = @GO@
 HAVE_GO = @HAVE_GO@
+HELM = @HELM@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -229,6 +234,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SORT = @SORT@
 STRIP = @STRIP@
+SUDO = @SUDO@
 UNIQ = @UNIQ@
 VERSION = @VERSION@
 XARGS = @XARGS@
@@ -300,6 +306,12 @@ mstored_SOURCES = \
     cmd/mstored/main.go
 
 CWD = $(shell pwd)
+DIST_DIR = $(shell pwd)/DIST
+IMAGE_REPO = localhost
+IMAGE_NAME = $(PACKAGE_NAME):$(PACKAGE_VERSION)
+IMAGE_TARNAME = $(PACKAGE_NAME)-$(PACKAGE_VERSION).img
+IMAGE_CONTAINERFILE = Containerfile
+CHART_NAME = $(PACKAGE_NAME)-$(PACKAGE_VERSION).tgz
 FREEBSD_LOCALBASE = /usr/local
 FREEBSD_RCDIR = $(FREEBSD_LOCALBASE)/etc/rc.d
 LINUX_SYSTEMDDIR = /lib/systemd/system
@@ -345,6 +357,10 @@ initrc/mstored.service: $(top_builddir)/config.status $(top_srcdir)/initrc/mstor
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 initrc/mstored: $(top_builddir)/config.status $(top_srcdir)/initrc/mstored.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+chart/Chart.yaml: $(top_builddir)/config.status $(top_srcdir)/chart/Chart.yaml.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+chart/values.yaml: $(top_builddir)/config.status $(top_srcdir)/chart/values.yaml.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -712,7 +728,7 @@ distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-local distclean-tags
 
 dvi: dvi-am
 
@@ -781,15 +797,15 @@ uninstall-am: uninstall-binPROGRAMS uninstall-sbinPROGRAMS
 	clean-sbinPROGRAMS cscope cscopelist-am ctags ctags-am dist \
 	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
 	dist-xz dist-zip dist-zstd distcheck distclean \
-	distclean-compile distclean-generic distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-sbinPROGRAMS install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	distclean-compile distclean-generic distclean-local \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-sbinPROGRAMS install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am uninstall-binPROGRAMS uninstall-sbinPROGRAMS
@@ -813,16 +829,25 @@ format:
 	    done  
 
 .PHONY: test
-
 test:
-	cd pkg/client && $(GO) test -v .
+	cd test && $(GO) test -v .
 
-clean-local:
-	$(FIND) $(CWD)  -name '*~' | $(XARGS) rm -f
-	rm -rf autom4te.cache
-	rm -f cmd/mstored/istored
-	rm -f cmd/mstorectl/mstorectl
-	rm -rf tmp/
+image:: build-image
+build-image: clean
+	$(GO) mod vendor
+	mkdir -p $(DIST_DIR)
+	$(SUDO) $(PODMAN) build -t $(IMAGE_REPO)/$(IMAGE_NAME) -f $(IMAGE_CONTAINERFILE) .
+	rm -f $(DIST_DIR)/$(IMAGE_TARNAME)
+	$(SUDO) $(PODMAN) image save $(IMAGE_REPO)/$(IMAGE_NAME) --format oci-archive \
+	      -o $(DIST_DIR)/$(IMAGE_TARNAME)
+	username=$$(whoami); \
+	    $(SUDO) chown $$username $(DIST_DIR)/$(IMAGE_TARNAME)
+	rm -rf vendor
+
+chart:: build-chart
+build-chart:
+	mkdir -p $(DIST_DIR)
+	$(HELM) package --destination $(DIST_DIR) chart/
 
 install-data-local:
 	test -z $(DESTDIR)$(srv_confdir) || $(MKDIR_P) $(DESTDIR)$(srv_confdir)
@@ -835,6 +860,17 @@ install-data-local:
 @LINUX_OS_TRUE@@SYSTEMD_TRUE@	test -z $(DESTDIR)$(LINUX_SYSTEMDDIR) || $(MKDIR_P) $(DESTDIR)$(LINUX_SYSTEMDDIR)
 @LINUX_OS_TRUE@@SYSTEMD_TRUE@	$(INSTALL_DATA) initrc/mstored.service $(DESTDIR)$(LINUX_SYSTEMDDIR)
 
+clean-local:
+	$(FIND) $(CWD)  -name '*~' | $(XARGS) rm -f
+	rm -rf autom4te.cache
+	rm -f cmd/mstored/istored
+	rm -f cmd/mstorectl/mstorectl
+	rm -rf tmp/
+
+distclean-local:
+	rm -rf autom4te.cache
+	rm -rf $(DIST_DIR)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: