Skip to content
Snippets Groups Projects
Verified Commit 1a4e7a22 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Updated build scripts

parent 25d4f8e2
No related branches found
No related tags found
No related merge requests found
FROM ubuntu:16.04 FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
python \ python \
python2.7 \ python2.7 \
libpython2.7 \ libpython2.7 \
python-setuptools \ python-setuptools \
python-imaging \
python-ldap \ python-ldap \
python-urllib3 \ python-urllib3 \
python-pip \ python-pip \
python-memcache \ python-memcache \
python-requests \
ffmpeg \ ffmpeg \
libmemcached-dev \ libmemcached-dev \
build-essential \ build-essential \
python-dev \ python-dev \
zlib1g-dev \ zlib1g-dev \
wget wget
RUN pip2 install --upgrade pip && \ RUN pip2 install --upgrade pip
pip2 install --upgrade wheel && \ RUN pip2 install --upgrade wheel
pip2 install --upgrade pillow \ RUN pip2 install --upgrade \
pillow==4.3.0 \
numpy==1.16.4 \ numpy==1.16.4 \
moviepy==0.2.3.5 \ moviepy==0.2.3.5 \
psycopg2-binary \ psycopg2-binary \
...@@ -26,8 +27,8 @@ RUN pip2 install --upgrade pip && \ ...@@ -26,8 +27,8 @@ RUN pip2 install --upgrade pip && \
django-pylibmc django-pylibmc
# add entrypoints # add entrypoints
ADD setenv.sh / ADD src/setenv.sh /
ADD docker-entrypoint.sh / ADD src/docker-entrypoint.sh /
# set environment variables for locale # set environment variables for locale
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8
......
Makefile 0 → 100644
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
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment