mwalbeck/email2pdf
1
0
Fork 0
forked from archive/andrewferrier_email2pdf
Code Pull requests Activity

Cleaner handling of docker.

Browse source
This commit is contained in:
Andrew Ferrier 2015-11-08 21:28:22 +00:00
parent 3a2d924714
commit b8c0057285
1 changed files with 5 additions and 5 deletions

10
Makefile
View file

@ -28,20 +28,20 @@ builddeb_real:
builddocker: determineversion builddocker: determineversion
docker build -t $(DOCKERTAG) . docker build -t $(DOCKERTAG) .
docker tag $(DOCKERTAG):latest $(DOCKERTAG):$(GITDESCRIBE) docker tag -f $(DOCKERTAG):latest $(DOCKERTAG):$(GITDESCRIBE)
builddocker_nocache: determineversion builddocker_nocache: determineversion
docker build --no-cache -t $(DOCKERTAG) . docker build --no-cache -t $(DOCKERTAG) .
docker tag $(DOCKERTAG):latest $(DOCKERTAG):$(GITDESCRIBE) docker tag -f $(DOCKERTAG):latest $(DOCKERTAG):$(GITDESCRIBE)
rundocker_interactive: builddocker rundocker_interactive: builddocker
docker run -i -t $(DOCKERTAG) /sbin/my_init -- bash -l docker run --rm -i -t $(DOCKERTAG) bash -l
rundocker_testing: builddocker rundocker_testing: builddocker
docker run -t $(DOCKERTAG) /sbin/my_init -- bash -c 'cd /tmp/email2pdf && make unittest && make stylecheck' docker run --rm -t $(DOCKERTAG) bash -c 'cd /tmp/email2pdf && make unittest && make stylecheck'
rundocker_getdebs: builddocker rundocker_getdebs: builddocker
docker run -v ${PWD}:/debs $(DOCKERTAG) sh -c 'cp /tmp/*.deb /debs' docker run --rm -v ${PWD}:/debs $(DOCKERTAG) sh -c 'cp /tmp/*.deb /debs'
unittest: unittest:
python3 -m unittest discover python3 -m unittest discover