From 23eccf00f424b41bda40493885586e187696ed0a Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Wed, 11 Dec 2019 18:34:36 +0100 Subject: [PATCH] Updated build scripts --- Dockerfile | 3 ++- Makefile | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Makefile diff --git a/Dockerfile b/Dockerfile index 6f1be07..5cd645f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jre RUN apt-get update && \ - apt-get install -y libgdiplus + apt-get install -y --no-install-recommends \ + libgdiplus ADD http://mcmyadmin.com/Downloads/MCMA2_glibc26_2.zip /tmp/ ADD http://mcmyadmin.com/Downloads/etc.zip /tmp/ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1949a53 --- /dev/null +++ b/Makefile @@ -0,0 +1,14 @@ +IMAGE := k8r.eu/justjanne/$(shell basename $(shell git remote get-url origin) .git) +TAGS := $(shell git describe --always --tags HEAD) + +.PHONY: build +build: + docker build --pull -t $(IMAGE):$(TAGS) . + docker tag $(IMAGE):$(TAGS) $(IMAGE):latest + @echo Successfully tagged $(IMAGE):$(TAGS) as latest + +.PHONY: push +push: build + docker push $(IMAGE):$(TAGS) + docker push $(IMAGE):latest + @echo Successfully pushed $(IMAGE):$(TAGS) as latest -- GitLab