Skip to content

Commit 62dc017

Browse files
committed
switch to docker-compose for building
1 parent 4a8b78c commit 62dc017

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

src/Dockerfile.decktape

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ LABEL maintainer="arne@hilmann.de"
44

55
USER root
66
RUN apk add --update inotify-tools jq curl && rm -rf /var/cache/apk/*
7-
RUN npm -g config set user root
8-
RUN npm install -g http-server && npm cache clean --force
97
COPY markdeck/loop.decktape /usr/local/bin/loop.decktape
108
RUN ln -sf /slides /target
119
USER node

src/Makefile

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
VERSION=0.20
2-
MOTTO="charts-n-math"
3-
41
PANDOC_VERSION=2.1.1
52
REVEALJS_VERSION=3.6.0
63
ASCIINEMAPLAYER_VERSION=v2.6.0
@@ -9,15 +6,7 @@ IMPRESSJS_VERSION=1.0.0-beta2
96

107

118
all: prepare
12-
docker build \
13-
--rm \
14-
--build-arg VERSION=$(VERSION) \
15-
--build-arg MOTTO=$(MOTTO) \
16-
--build-arg http_proxy=$${http_proxy:-} \
17-
--build-arg https_proxy=$${https_proxy:-} \
18-
-t arne/markdeck:latest \
19-
-t arne/markdeck:$(VERSION) \
20-
.
9+
docker-compose build
2110

2211

2312
tag: all
@@ -26,8 +15,7 @@ tag: all
2615

2716

2817
push: all
29-
docker push arne/markdeck:$(VERSION)
30-
docker push arne/markdeck:latest
18+
docker-compose push
3119

3220

3321
prepare: downloaded/bin/pandoc \

0 commit comments

Comments
 (0)