Improve build scripts

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
 

Makefile

-$(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

build.sh

-#!/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

deploy.sh

-#!/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

push.sh

-#!/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

src/Makefile

+$(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)/