From 825c57e8a94f887fb55ab1231a60a98cf10e9a2c Mon Sep 17 00:00:00 2001
From: Felipe M <me@fmartingr.com>
Date: Fri, 3 Jul 2020 17:35:31 +0200
Subject: [PATCH] Dev Dockerfile + Makefile

---
 Dockerfile.dev |  6 +++---
 Makefile       | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Dockerfile.dev b/Dockerfile.dev
index f8063df..d01673e 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -3,17 +3,17 @@ FROM alpine:3.11
 ENV PYTHON_VERSION=3.8.2-r0
 ENV APP_PORT 8080
 ENV BUILD_DIR /tmp/build
-ENV BUTTERROBOT_VERSION 0.0.1
 
 WORKDIR ${BUILD_DIR}
+COPY README.md ${BUILD_DIR}/README.md
 COPY poetry.lock ${BUILD_DIR}/poetry.lock
 COPY pyproject.toml ${BUILD_DIR}/pyproject.toml
 COPY ./butterrobot ${BUILD_DIR}/butterrobot
 COPY ./butterrobot_plugins_contrib ${BUILD_DIR}/butterrobot_plugins_contrib
-RUN apk --update add python3-dev==${PYTHON_VERSION} gcc musl-dev libffi-dev openssl-dev && \
+RUN apk --update add curl python3-dev==${PYTHON_VERSION} gcc musl-dev libffi-dev openssl-dev && \
     pip3 install poetry && \
     poetry build && \
-    pip3 install ${BUILD_DIR}/dist/butterrobot-${BUTTERROBOT_VERSION}.tar.gz && \
+    pip3 install ${BUILD_DIR}/dist/butterrobot-*.tar.gz && \
     rm -rf ${BUILD_DIR}
 COPY ./docker/bin/start-server.sh /usr/local/bin/start-server
 
diff --git a/Makefile b/Makefile
index f6148b4..cf6f0a8 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,21 @@ setup:
 	poetry install
 
 docker@build:
-	docker build -t fmartingr/butterrobot .
+	docker build -t fmartingr/butterrobot -f docker/Dockerfile docker
 
-podman@build:
-	podman build -t fmartingr/butterrobot .
+docker@build-dev:
+	docker build -t fmartingr/butterrobot:dev -f Dockerfile.dev .
+
+docker@tag-dev:
+	docker tag fmartingr/butterrobot:dev registry.int.fmartingr.network/fmartingr/butterrobot:dev
+
+docker@push-dev:
+	docker push registry.int.fmartingr.network/fmartingr/butterrobot:dev
+
+docker@dev:
+	make docker@build-dev
+	make docker@tag-dev
+	make docker@push-dev
 
 docker@save:
 	make docker@build