Skip to content

Commit

Permalink
Remove Docker support.
Browse files Browse the repository at this point in the history
Not really used (by me at least), and just an additional item to
maintain.
  • Loading branch information
Andrew Ferrier committed Jan 23, 2021
1 parent 515dfd0 commit 212c3e9
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 50 deletions.
27 changes: 0 additions & 27 deletions Dockerfile

This file was deleted.

23 changes: 0 additions & 23 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
ROOTDIR :=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
TEMPDIR := $(shell mktemp -t tmp.XXXXXX -d)
FLAKE8 := $(shell which flake8)
UNAME := $(shell uname)
DOCKERTAG = andrewferrier/email2pdf

.PHONY: all builddeb clean test

Expand All @@ -16,11 +14,7 @@ determineversion:
sed 's/X\.Y/$(GITDESCRIBE_ABBREV)/' brew/email2pdf_template.rb > brew/email2pdf.rb
sed 's/pkgver=X/pkgver=$(GITDESCRIBE_ABBREV)/' PKGBUILD_template > PKGBUILD

ifeq ($(UNAME),Linux)
builddeb: determineversion builddeb_real
else
builddeb: rundocker_getdebs
endif

builddeb_real:
dpkg -s build-essential || sudo apt-get install build-essential
Expand All @@ -38,23 +32,6 @@ builddeb_real:
buildarch: determineversion
makepkg --skipinteg

builddocker: determineversion
docker build -t $(DOCKERTAG) .
docker tag $(DOCKERTAG):latest $(DOCKERTAG):$(GITDESCRIBE)

builddocker_nocache: determineversion
docker build --no-cache -t $(DOCKERTAG) .
docker tag $(DOCKERTAG):latest $(DOCKERTAG):$(GITDESCRIBE)

rundocker_interactive: builddocker
docker run --rm -i -t $(DOCKERTAG) bash -l

rundocker_testing: builddocker
docker run --rm -t $(DOCKERTAG) bash -c 'cd /tmp/email2pdf && make unittest && make stylecheck'

rundocker_getdebs: builddocker
docker run --rm -v ${PWD}:/debs $(DOCKERTAG) sh -c 'cp /tmp/*.deb /debs'

unittest:
python3 -m unittest discover

Expand Down

0 comments on commit 212c3e9

Please sign in to comment.