Dockerfile

@@ -1,14 +1,10 @@
+FROM registry.opensuse.org/opensuse/tumbleweed:latest
+
 ARG VERSION
-FROM registry.opensuse.org/opensuse/tumbleweed:${VERSION}
 
 RUN zypper --non-interactive install \
   openssh-clients \
-  restic \
+  restic-${VERSION} \
   && zypper clean -a
-
-ENV TZ="Europe/Stockholm"
-
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
+ADD entrypoint.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-CMD ["start"]

Makefile

@@ -1,51 +1,21 @@
-.PHONY: default build clean release require_clean_git
-
+.PHONY: default build clean
 
 -include .env
 
-VERSION=20230926
-IMAGENAME=restic
-REPO=git.rre.nu/jonas
-TITLE=restic with openSSH based on openSUSE Tumpleweed
-DESC=Image containing restic & openSSH, based on openSUSE Tumbleweed
+VERSION=0.15.1-1.2
 
 SHELL := /bin/bash
 
+guard:
+	@ if [ -z "$(git status --porcelain)" ]; then echo "git repo not clean"; exit 1; fi
+
 default: build
 
-require_clean_git:
-	git update-index -q --ignore-submodules --refresh
-	git diff-files --quiet --ignore-submodules
-	git diff-index --cached --quiet --ignore-submodules HEAD --
-	@status=$$(git status --porcelain); \
-	if test "x$${status}" = x; then \
-		echo "No untracked files detected"; \
-	else \
-		echo "Untracked files detected" >&2; \
-		exit 1; \
-	fi
-
 build:
-	podman build \
-		--build-arg VERSION="$(VERSION)" \
-		--label org.opencontainers.image.source="https://${REPO}/${IMAGENAME}/src/tag/v${VERSION}" \
-		--label org.opencontainers.image.title="${TITLE}" \
-		--label org.opencontainers.image.description="${DESC}" \
-		--label org.opencontainers.image.created="$(shell TZ=UTC date --iso-8601=ns)" \
-		--label org.opencontainers.image.url="https://${REPO}/-/packages/container/${IMAGENAME}/${VERSION}" \
-		--label org.opencontainers.image.version="${VERSION}" \
-		--label org.opencontainers.image.vendor="Jonas Forsberg" \
-		--tag ${REPO}/${IMAGENAME}:$(VERSION) \
-		.
+	podman build --build-arg VERSION=$(VERSION) --tag docker.io/bardak/restic:$(VERSION) .
 
 clean:
-	podman image rm ${REPO}/${IMAGENAME}:$(VERSION)
+	podman image rm docker.io/bardak/restic:$(VERSION)
 
-release: require_clean_git build
-	$(eval TMP_MESSAGE := $(shell podman run --rm -it ${REPO}/${IMAGENAME}:$(VERSION) /usr/bin/restic --version))
-	git tag -a v$(VERSION) -m "restic version: ${TMP_MESSAGE}"
-	git push origin v$(VERSION)
-	podman tag ${REPO}/${IMAGENAME}:$(VERSION) ${REPO}/${IMAGENAME}:latest
-	@ echo "Pushing images"
-	@ podman push --creds $(USERNAME):$(PASSWORD) ${REPO}/${IMAGENAME}:$(VERSION)
-	@ podman push --creds $(USERNAME):$(PASSWORD) ${REPO}/${IMAGENAME}:latest
+push: guard build
+	podman push --creds $(USERNAME):$(PASSWORD) docker.io/bardak/restic:$(VERSION)

autobuild.sh

@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-set -aeou pipefail
-
-BASE_IMAGE="registry.opensuse.org/opensuse/tumbleweed"
-TARGET_REPO="git.rre.nu/jonas/"
-PACKAGE_NAME="restic"
-
-git pull
-
-echo "Pulling latest tumbleweed"
-podman pull "${BASE_IMAGE}:latest"
-
-CURRENT_TUMBLEWEED_TAG="$(sed -n 's/.*VERSION=\([0-9]\)/\1/p' Makefile)"
-LATEST_TUMBLEWEED_TAG="$(podman image inspect --format "{{.Labels}}" registry.opensuse.org/opensuse/tumbleweed:latest | sed -n 's/.*org\.opencontainers\.image\.version:\([0-9]\{8\}\).*/\1/p')"
-
-if [[ "$CURRENT_TUMBLEWEED_TAG" == "$LATEST_TUMBLEWEED_TAG" ]]; then
-    echo "Already running latest tumbleweed version"
-    exit 0
-fi
-
-echo "New tumbleweed image exists"
-if [[ "x" == "x$(podman run --rm -it ${TARGET_REPO}${PACKAGE_NAME}:latest /usr/bin/bash -c "zypper list-updates | grep $PACKAGE_NAME")" ]]; then
-    echo "No updates for $PACKAGE_NAME"
-    exit 0
-fi
-LATEST_VERSION="$(podman run --rm -it ${BASE_IMAGE}:latest /usr/bin/bash -c "zypper ref > /dev/null && zypper info $PACKAGE_NAME | sed -n 's/.*Version        : \(.*\)$/\1/p'")"
-
-echo "updates found  : $LATEST_VERSION"
-
-#Updateing Makefile with latest image tag
-sed -i 's/VERSION='"$CURRENT_TUMBLEWEED_TAG"'/VERSION='"$LATEST_TUMBLEWEED_TAG"'/' Makefile
-git add Makefile
-git commit -m "Updated tumpleweed image to $LATEST_TUMBLEWEED_TAG, $PACKAGE_NAME to $LATEST_VERSION"
-git push
-
-echo "build and push new image"
-
-make release
-

entrypoint.sh

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/bash
+#
 
-
-if [[ "$1" == "start" ]]; then
-    /usr/bin/restic "$@"
+if [[ "$1" == "bash" ]]; then
+    exec /usr/bin/bash
 else
-    exec "$@"
+    restic "$@"
 fi