From 1109392ca55c8a2195df20ab08cb571663b2f5cc Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 11 Dec 2019 18:12:52 +0100
Subject: [PATCH] Improve build scripts

---
 Dockerfile                           |  6 +++---
 Makefile                             | 20 ++++++++++++--------
 build.sh                             |  7 -------
 deploy.sh                            |  8 --------
 push.sh                              |  7 -------
 src/Makefile                         | 10 ++++++++++
 apksigner.sh => src/apksigner.sh     |  0
 update_repo.sh => src/update_repo.sh |  0
 8 files changed, 25 insertions(+), 33 deletions(-)
 delete mode 100755 build.sh
 delete mode 100755 deploy.sh
 delete mode 100755 push.sh
 create mode 100644 src/Makefile
 rename apksigner.sh => src/apksigner.sh (100%)
 rename update_repo.sh => src/update_repo.sh (100%)

diff --git a/Dockerfile b/Dockerfile
index c77cc1a..7461f22 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,9 +10,9 @@ RUN apt-get update && \
 RUN pip install s3cmd
 
 RUN unlink /usr/bin/apksigner
-ADD apksigner.sh /usr/bin/apksigner
-ADD update_repo.sh /
-ADD Makefile /
+ADD src/apksigner.sh /usr/bin/apksigner
+ADD src/update_repo.sh /
+ADD src/Makefile /
 
 ENV UPDATE_WAIT=10
 
diff --git a/Makefile b/Makefile
index 5b69749..e72d629 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,14 @@
-$(REPO_PATH)/index.jar: s3
-	fdroid update --use-date-from-apk
-	fdroid server update
+IMAGE := k8r.eu/justjanne/$(shell basename $(shell git rev-parse --show-toplevel))
+TAGS := $(shell git describe --always --tags HEAD)
 
-s3: update_s3
+.PHONY: build
+build:
+	docker build --pull -t $(IMAGE):$(TAGS) .
+	docker tag $(IMAGE):$(TAGS) $(IMAGE):latest
+	@echo Successfully tagged $(IMAGE):$(TAGS) as latest
 
-.PHONY: update_s3
-update_s3:
-	s3cmd sync --preserve s3://releases/quasseldroid-ng/ $(S3_PATH)/
-	rsync -rlpcgoDv $(S3_PATH)/*-release.apk $(REPO_PATH)/
+.PHONY: push
+push: build
+	docker push $(IMAGE):$(TAGS)
+	docker push $(IMAGE):latest
+	@echo Successfully pushed $(IMAGE):$(TAGS) as latest
diff --git a/build.sh b/build.sh
deleted file mode 100755
index e501902..0000000
--- a/build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-IMAGE=k8r.eu/justjanne/fdroid-repo
-TAGS=$(git describe --always --tags HEAD)
-
-docker build --pull -t $IMAGE:$TAGS .
-docker tag $IMAGE:$TAGS $IMAGE:latest
-echo Successfully tagged $IMAGE:latest
diff --git a/deploy.sh b/deploy.sh
deleted file mode 100755
index 42e3b8e..0000000
--- a/deploy.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-IMAGE=k8r.eu/justjanne/fdroid-repo
-TAGS=$(git describe --always --tags HEAD)
-NAMESPACE=default
-DEPLOYMENT=fdroid-repo
-POD=sync
-
-kubectl -n $NAMESPACE set image deployment/$DEPLOYMENT $POD=$IMAGE:$TAGS
diff --git a/push.sh b/push.sh
deleted file mode 100755
index 0e9fef0..0000000
--- a/push.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-IMAGE=k8r.eu/justjanne/fdroid-repo
-TAGS=$(git describe --always --tags HEAD)
-
-docker push $IMAGE:$TAGS
-docker push $IMAGE:latest
-echo Successfully pushed $IMAGE:$TAGS as $IMAGE:latest
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..5b69749
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,10 @@
+$(REPO_PATH)/index.jar: s3
+	fdroid update --use-date-from-apk
+	fdroid server update
+
+s3: update_s3
+
+.PHONY: update_s3
+update_s3:
+	s3cmd sync --preserve s3://releases/quasseldroid-ng/ $(S3_PATH)/
+	rsync -rlpcgoDv $(S3_PATH)/*-release.apk $(REPO_PATH)/
diff --git a/apksigner.sh b/src/apksigner.sh
similarity index 100%
rename from apksigner.sh
rename to src/apksigner.sh
diff --git a/update_repo.sh b/src/update_repo.sh
similarity index 100%
rename from update_repo.sh
rename to src/update_repo.sh
-- 
GitLab