diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 0eb18e9..0000000 --- a/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM debian -LABEL maintainer="Andrew Ferrier " -RUN apt-get update && apt-get install -y git build-essential \ - fontconfig \ - gdebi-core \ - getmail4 \ - libfontconfig1 \ - libfreetype6 \ - libjpeg62-turbo \ - libx11-6 \ - libxext6 \ - libxrender1 \ - python \ - python3-pip \ - wget \ - xfonts-75dpi \ - xfonts-base -WORKDIR /tmp -RUN wget -O wkhtmltox.deb 'https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb' -RUN dpkg -i *.deb -RUN mkdir /etc/vim && wget -O /etc/vim/vimrc.local https://raw.githubusercontent.com/tpope/vim-sensible/master/plugin/sensible.vim -COPY . /tmp/email2pdf/ -COPY docker/email2pdf/getmail /etc/cron.d/ -WORKDIR /tmp/email2pdf -RUN pip3 install -r requirements_hacking.txt -RUN make builddeb_real && sh -c 'ls -1 /tmp/email2pdf/*.deb | xargs -L 1 gdebi -n' && cp /tmp/email2pdf/*.deb /tmp -RUN apt-get clean && rm -rf /var/lib/apt/lists/* /var/tmp/* diff --git a/Makefile b/Makefile index 110763f..66aaebb 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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 @@ -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