little improvements to Dockerfiles

docker/Dockerfile.alpine

@@ -1,14 +1,14 @@
 FROM alpine:3.8
 MAINTAINER Oz Tiram <[email protected]>
 
-RUN apk update
+RUN apk update \
+    && apk add bash alpine-sdk python3-dev linux-headers py3-cryptography libffi-dev
 
-RUN apk add bash alpine-sdk python3-dev linux-headers py3-cryptography libffi-dev
+COPY requirements.txt requirements_ci.txt ./
 
-COPY requirements.txt requirements_dev.txt ./
-
-RUN pip3 install -r requirements.txt
-RUN pip3 install -r requirements_dev.txt
-RUN rm requirements.txt requirements_dev.txt
-
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && mv kubectl /usr/local/bin/kubectl  && chmod  777  /usr/local/bin/kubectl
+RUN pip3 install -r requirements.txt \
+    && pip3 install -r requirements_ci.txt \
+    && rm requirements.txt requirements_ci.txt \
+    && curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl \
+    && mv kubectl /usr/local/bin/kubectl \
+    && chmod  777  /usr/local/bin/kubectl

docker/Dockerfile.ubuntu

@@ -1,12 +1,15 @@
-FROM alpine:3.8
+FROM ubuntu:18.04
 MAINTAINER Oz Tiram <[email protected]>
 
-RUN apk update
+RUN apt-get update \
+    && apt-get -y upgrade \
+    && apt-get -y install python3 python3-pip python3-dev python3-cryptography libffi-dev curl
 
-RUN apk add alpine-sdk python3-dev linux-headers py3-cryptography libffi-dev
+COPY requirements.txt requirements_ci.txt ./
 
-COPY requirements.txt requirements_dev.txt ./
-
-RUN pip3 install -r requirements.txt
-RUN pip3 install -r requirements_dev.txt
-RUN rm requirements.txt requirements_dev.txt
+RUN pip3 install -r requirements.txt \
+    && pip3 install -r requirements_ci.txt \
+    && rm requirements.txt requirements_ci.txt \
+    && curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl \
+    && mv kubectl /usr/local/bin/kubectl \
+    && chmod  777  /usr/local/bin/kubectl

requirements_ci.txt

@@ -0,0 +1,10 @@
+flake8>=3.5.0
+coverage>=4.5.1
+Sphinx==1.7.1
+twine==1.10.0
+
+pytest
+pytest-coverage
+pytest-runner
+
+-r requirements.txt

requirements_dev.txt

@@ -1,10 +1,3 @@
--e .
-flake8>=3.5.0
-coverage>=4.5.1
-Sphinx==1.7.1
-twine==1.10.0
-
-pytest
-pytest-coverage
-pytest-runner
 -r requirements.txt
+-r requirements_ci.txt
+-e .