Updated build scripts

Dockerfile

-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     python \
     python2.7 \
     libpython2.7 \
     python-setuptools \
-    python-imaging \
     python-ldap \
     python-urllib3 \
     python-pip \
     python-memcache \
+    python-requests \
     ffmpeg \
     libmemcached-dev \
     build-essential \
     python-dev \
     zlib1g-dev \
     wget
-RUN pip2 install --upgrade pip && \
-    pip2 install --upgrade wheel && \
-    pip2 install --upgrade pillow \
+RUN pip2 install --upgrade pip
+RUN pip2 install --upgrade wheel
+RUN pip2 install --upgrade \
+      pillow==4.3.0 \
       numpy==1.16.4 \
       moviepy==0.2.3.5 \
       psycopg2-binary \
@@ -26,8 +27,8 @@ RUN pip2 install --upgrade pip && \
       django-pylibmc
 
 # add entrypoints
-ADD setenv.sh /
-ADD docker-entrypoint.sh /
+ADD src/setenv.sh /
+ADD src/docker-entrypoint.sh /
 
 # set environment variables for locale
 ENV LANG=C.UTF-8

Makefile

+IMAGE := k8r.eu/justjanne/$(shell basename $(shell git remote get-url origin) .git)
+TAGS := $(shell git describe --always --tags HEAD)
+
+.PHONY: build
+build:
+	docker build --pull -t $(IMAGE):$(TAGS) .
+	docker tag $(IMAGE):$(TAGS) $(IMAGE):latest
+	@echo Successfully tagged $(IMAGE):$(TAGS) as latest
+
+.PHONY: push
+push: build
+	docker push $(IMAGE):$(TAGS)
+	docker push $(IMAGE):latest
+	@echo Successfully pushed $(IMAGE):$(TAGS) as latest