switch to docker-compose for building

arnehilmann · Jul 6, 2018 · 62dc017 · 62dc017
1 parent 4a8b78c
commit 62dc017
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/src/Dockerfile.decktape b/src/Dockerfile.decktape
@@ -4,8 +4,6 @@ LABEL maintainer="arne@hilmann.de"
 
 USER root
 RUN apk add --update inotify-tools jq curl && rm -rf /var/cache/apk/*
-RUN npm -g config set user root
-RUN npm install -g http-server && npm cache clean --force
 COPY markdeck/loop.decktape /usr/local/bin/loop.decktape
 RUN ln -sf /slides /target
 USER node

diff --git a/src/Makefile b/src/Makefile
@@ -1,6 +1,3 @@
-VERSION=0.20
-MOTTO="charts-n-math"
-
 PANDOC_VERSION=2.1.1
 REVEALJS_VERSION=3.6.0
 ASCIINEMAPLAYER_VERSION=v2.6.0
@@ -9,15 +6,7 @@ IMPRESSJS_VERSION=1.0.0-beta2
 
 
 all:	prepare
-	docker build \
-		--rm \
-		--build-arg VERSION=$(VERSION) \
-		--build-arg MOTTO=$(MOTTO) \
-		--build-arg http_proxy=$${http_proxy:-} \
-		--build-arg https_proxy=$${https_proxy:-} \
-		-t arne/markdeck:latest \
-		-t arne/markdeck:$(VERSION) \
-		.
+	docker-compose build
 
 
 tag:	all
@@ -26,8 +15,7 @@ tag:	all
 
 
 push:	all
-	docker push arne/markdeck:$(VERSION)
-	docker push arne/markdeck:latest
+	docker-compose push
 
 
 prepare:	downloaded/bin/pandoc \