From 9c638f3fe8145f35abb8b7ef8d4b292ee735de5a Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 30 Oct 2018 16:05:50 -0500 Subject: [PATCH] Add Additional Docker/Python Versions --- .travis.yml | 3 +-- docker-compose.yml | 41 +++++++++++++++++++++++++++++++++++++- docker/Dockerfile.dev | 4 +++- docker/Dockerfile.dev-py35 | 24 ++++++++++++++++++++++ docker/Dockerfile.dev-py36 | 24 ++++++++++++++++++++++ 5 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 docker/Dockerfile.dev-py35 create mode 100644 docker/Dockerfile.dev-py36 diff --git a/.travis.yml b/.travis.yml index 9b021198..33da5b2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,7 @@ os: python: - 3.5 - 3.6 - # not supported by travis yet. - # - 3.7 + - 3.7 services: - memcached - redis-server diff --git a/docker-compose.yml b/docker-compose.yml index aad5ea48..06d2c780 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ version: "3" services: - cement: + cement: &DEFAULTS image: "cement:dev" build: context: . @@ -18,6 +18,45 @@ services: REDIS_HOST: redis MEMCACHED_HOST: memcached + cement-py35: + <<: *DEFAULTS + image: "cement:dev-py35" + build: + context: . + dockerfile: docker/Dockerfile.dev-py35 + # hostname: cement + # stdin_open: true + # tty: true + # volumes: + # - '.:/src' + # working_dir: '/src' + # links: + # - redis:redis + # - memcached:memcached + # environment: + # REDIS_HOST: redis + # MEMCACHED_HOST: memcached + + cement-py36: + image: "cement:dev-py36" + build: + context: . + dockerfile: docker/Dockerfile.dev-py36 + <<: *DEFAULTS + # hostname: cement + # stdin_open: true + # tty: true + # volumes: + # - '.:/src' + # working_dir: '/src' + # links: + # - redis:redis + # - memcached:memcached + # environment: + # REDIS_HOST: redis + # MEMCACHED_HOST: memcached + + redis: redis: image: redis:latest hostname: redis diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index 43cb5843..fd8190e6 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM python:3.6-alpine +FROM python:3.7-alpine MAINTAINER BJ Dierkes ENV PS1="\[\e[0;33m\]|> cement <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " @@ -14,6 +14,8 @@ RUN apk update \ vim \ bash \ git \ + libffi \ + libffi-dev \ && ln -sf /usr/bin/vim /usr/bin/vi \ && pip install --no-cache-dir -r requirements-dev.txt COPY . /src diff --git a/docker/Dockerfile.dev-py35 b/docker/Dockerfile.dev-py35 new file mode 100644 index 00000000..45b4424c --- /dev/null +++ b/docker/Dockerfile.dev-py35 @@ -0,0 +1,24 @@ +FROM python:3.5-alpine +MAINTAINER BJ Dierkes +ENV PS1="\[\e[0;33m\]|> cement <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " + +WORKDIR /src +COPY requirements-dev.txt /src/ +RUN apk update \ + && apk add libmemcached-dev \ + gcc \ + musl-dev \ + cyrus-sasl-dev \ + zlib-dev \ + make \ + vim \ + bash \ + git \ + libffi \ + libffi-dev \ + && ln -sf /usr/bin/vim /usr/bin/vi \ + && pip install --no-cache-dir -r requirements-dev.txt +COPY . /src +COPY docker/vimrc /root/.vimrc +RUN python setup.py develop +CMD ["/bin/bash"] diff --git a/docker/Dockerfile.dev-py36 b/docker/Dockerfile.dev-py36 new file mode 100644 index 00000000..d5eb2c02 --- /dev/null +++ b/docker/Dockerfile.dev-py36 @@ -0,0 +1,24 @@ +FROM python:3.6-alpine +MAINTAINER BJ Dierkes +ENV PS1="\[\e[0;33m\]|> cement <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# " + +WORKDIR /src +COPY requirements-dev.txt /src/ +RUN apk update \ + && apk add libmemcached-dev \ + gcc \ + musl-dev \ + cyrus-sasl-dev \ + zlib-dev \ + make \ + vim \ + bash \ + git \ + libffi \ + libffi-dev \ + && ln -sf /usr/bin/vim /usr/bin/vi \ + && pip install --no-cache-dir -r requirements-dev.txt +COPY . /src +COPY docker/vimrc /root/.vimrc +RUN python setup.py develop +CMD ["/bin/bash"]