From 0d7636a87f1489824123a8e9b581f970a067ebd5 Mon Sep 17 00:00:00 2001 From: Matheus Mota Date: Sun, 7 Apr 2019 23:32:51 -0300 Subject: [PATCH 1/2] updating readme header - preparing for automated docker building --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index fc53903..0cb9500 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[![GitHub license](https://img.shields.io/github/license/Naereen/StrapDown.js.svg)](https://github.com/datasci4health/harena-manager/blob/master/LICENSE) -[![Docker Automated](https://img.shields.io/docker/cloud/automated/datasci4health/harena-manager.svg?style=flat)](https://cloud.docker.com/u/datasci4health/repository/registry-1.docker.io/datasci4health/harena-manager) -[![Docker Build](https://img.shields.io/docker/cloud/build/datasci4health/harena-manager.svg?style=flat)](https://cloud.docker.com/u/datasci4health/repository/registry-1.docker.io/datasci4health/harena-manager) -[![Docker Pulls](https://img.shields.io/docker/pulls/datasci4health/harena-manager.svg?style=flat)](https://cloud.docker.com/u/datasci4health/repository/registry-1.docker.io/datasci4health/harena-manager) -[![Docker Stars](https://img.shields.io/docker/stars/datasci4health/harena-manager.svg?style=flat)](https://cloud.docker.com/u/datasci4health/repository/registry-1.docker.io/datasci4health/harena-manager) +[![GitHub license](https://img.shields.io/github/license/Naereen/StrapDown.js.svg)](https://github.com/datasci4health/harena-logger/blob/master/LICENSE) +[![Docker Automated](https://img.shields.io/docker/cloud/automated/datasci4health/harena-logger.svg?style=flat)](https://cloud.docker.com/u/datasci4health/repository/registry-1.docker.io/datasci4health/harena-logger) +[![Docker Build](https://img.shields.io/docker/cloud/build/datasci4health/harena-logger.svg?style=flat)](https://cloud.docker.com/u/datasci4health/repository/registry-1.docker.io/datasci4health/harena-logger) +[![Docker Pulls](https://img.shields.io/docker/pulls/datasci4health/harena-logger.svg?style=flat)](https://cloud.docker.com/u/datasci4health/repository/registry-1.docker.io/datasci4health/harena-logger) +[![Docker Stars](https://img.shields.io/docker/stars/datasci4health/harena-logger.svg?style=flat)](https://cloud.docker.com/u/datasci4health/repository/registry-1.docker.io/datasci4health/harena-logger) # herena-logger @@ -10,7 +10,7 @@ ## Table of Contents - * [herena-manager](#herena-manager) + * [herena-logger](#herena-logger) * [Table of Contents](#table-of-contents) * [Getting Started](#getting-started) * [Running as Docker containers - Linux](#running-as-docker-containers---linux) From a4daa4d204c8e328ecd8b37dc422b0eba3274d8e Mon Sep 17 00:00:00 2001 From: Matheus Mota Date: Fri, 26 Apr 2019 00:07:54 -0300 Subject: [PATCH 2/2] major reorganization - preparing auto building --- Dockerfile | 12 +++ docker-compose.yml | 86 +++---------------- modules/relayer/Dockerfile | 11 --- .../requirements.txt => requirements.txt | 0 {modules/relayer/src => src}/config.py | 0 {modules/relayer/src => src}/server.py | 0 6 files changed, 26 insertions(+), 83 deletions(-) create mode 100644 Dockerfile delete mode 100644 modules/relayer/Dockerfile rename modules/relayer/requirements.txt => requirements.txt (100%) rename {modules/relayer/src => src}/config.py (100%) rename {modules/relayer/src => src}/server.py (100%) diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..f2cdfca --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM python:3.7-alpine + +WORKDIR /app + +COPY requirements.txt . + +RUN pip3 install --upgrade pip +RUN pip3 install --upgrade -r requirements.txt + +ADD ./src . + +CMD ["python3", "server.py"] diff --git a/docker-compose.yml b/docker-compose.yml index 681d6a7..0b0f2e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,51 +2,35 @@ version: '3' services: - - - - - broker: - image: eclipse-mosquitto - container_name: "broker" - ports: - - 1883:1883 -# - 9001:9001 -# volumes: -# - broker_config:/mosquitto/config/ - restart: always - - - - - - relayer: - build: ./modules/relayer - container_name: "relayer" + harena-logger: + image: test environment: - - HARENA_LOGGER_BROKER_HOST=broker + - HARENA_LOGGER_BROKER_HOST=harena-logger-broker - HARENA_LOGGER_BROKER_PORT=1883 - HARENA_LOGGER_FLASK_HOST=0.0.0.0 - HARENA_LOGGER_FLASK_PORT=5000 - HARENA_LOGGER_FLASK_DEBUG=False - - HARENA_LOGGER_MONGODB_HOST=mongodb + - HARENA_LOGGER_MONGODB_HOST=harena-logger-mongodb - HARENA_LOGGER_MONGODB_PORT=27017 - HARENA_LOGGER_MONGODB_DB=harena_logger - HARENA_LOGGER_MONGODB_COLLECTION=executions ports: - 5000:5000 depends_on: - - broker - - mongodb + - harena-logger-broker + - harena-logger-mongodb restart: always + + harena-logger-broker: + image: eclipse-mosquitto + ports: + - 1883:1883 + restart: always - - - mongodb: + harena-logger-mongodb: image: mongo:latest - container_name: "mongodb" environment: - MONGO_DATA_DIR=/data/db - MONGO_LOG_DIR=/dev/null @@ -58,47 +42,5 @@ services: - - swagger: - image: swaggerapi/swagger-ui - container_name: "swagger" - environment: - - SWAGGER_JSON=/openapi.yaml - volumes: - - ./docs/openapi.yaml:/openapi.yaml - ports: - - 4000:8080 - restart: always - - volumes: - harena_logger_mongodb: - - - # database: - # image: mysql:5.7 - # ports: - # - "3306:3306" - # volumes: - # - database:/var/lib/mysql - # environment: # will be replaced to .env vars, as in ${DB_PASSWORD} - # - MYSQL_DATABASE=jacinto-casemanager - # - MYSQL_USER=jacinto-casemanager - # - MYSQL_ALLOW_EMPTY_PASSWORD=yes - # - MYSQL_PASSWORD=jacinto - # - MYSQL_ROOT_PASSWORD=root - # restart: always - - - # database-ui: - # image: phpmyadmin/phpmyadmin:latest - # links: - # - database - # ports: - # - 80:80 - # environment: - # - PMA_ARBITRARY=0 # connection to any server - # - PMA_HOST=database - # - PMA_PORT=3306 - # depends_on: - # - database + harena_logger_mongodb: \ No newline at end of file diff --git a/modules/relayer/Dockerfile b/modules/relayer/Dockerfile deleted file mode 100644 index e70742b..0000000 --- a/modules/relayer/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM python:3.7-alpine - -WORKDIR /app - -COPY requirements.txt . - -RUN pip3 install -U -r requirements.txt - -ADD . . - -CMD ["python3", "src/server.py"] diff --git a/modules/relayer/requirements.txt b/requirements.txt similarity index 100% rename from modules/relayer/requirements.txt rename to requirements.txt diff --git a/modules/relayer/src/config.py b/src/config.py similarity index 100% rename from modules/relayer/src/config.py rename to src/config.py diff --git a/modules/relayer/src/server.py b/src/server.py similarity index 100% rename from modules/relayer/src/server.py rename to src/server.py