From 2a452fd7f8312ac293e59788e23b4c22afa5eed6 Mon Sep 17 00:00:00 2001
From: parra <victor+git@parravidales.es>
Date: Fri, 23 Sep 2022 17:43:55 +0200
Subject: [PATCH 1/5] Updated README.md
---
README.md | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index c7aee98..eb0bc06 100644
--- a/README.md
+++ b/README.md
@@ -6,26 +6,22 @@ Obtiene y publica precios de criptomonedas.
## Instalación y ejecución desde CLI
-Descargar el repositorio en una nueva carpeta:
+1. Descargar el repositorio en una nueva carpeta:
-````shell
-git clone https://git.cuzo.dev/Parra/crypto-reporter.git
-````
-
-Copiar el fichero `env_file` a `.env` y abrirlo con un editor de textos y editarlo
+2. Copiar el fichero `env_file` a `.env` y abrirlo con un editor de textos y editarlo
con la información del servidor MQTT, así como editar los tópicos que se quieran usar
y el tiempo de refresco.
-Dar permisos de ejecución al fichero principal con `chmod +x main.py` y ejecutar con `./main.py`.
+3. Dar permisos de ejecución al fichero principal con `chmod +x main.py` y ejecutar con `./main.py`.
## Instalación y ejecución desde Docker
-Crear una carpeta (por ejemplo `crypto-reporter`) y acceder a ella.
+1. Crear una carpeta (por ejemplo `crypto-reporter`) y acceder a ella.
-Crear un fichero `.env` con el contenido del fichero `env_file` de este repositorio y
+2. Crear un fichero `.env` con el contenido del fichero `env_file` de este repositorio y
editarlo con la información del servidor MQTT.
-Crear un fichero `docker-compose.yml` como el siguiente:
+3. Crear un fichero `docker-compose.yml` como el siguiente:
````yml
version: '3'
@@ -38,8 +34,8 @@ services:
- ./.env:/.env:ro
````
-Ejecutar con el comando `docker compose up -d`.
+4. Ejecutar con el comando `docker compose up -d`.
## Menciones
-La API se extrae de Coingecko y se puede consultar aquí: https://www.coingecko.com/en/api/documentation
\ No newline at end of file
+La API se extrae de Coingecko y se puede consultar aquí: https://www.coingecko.com/en/api/documentation
From e54f02cfae239fcf82065dd1fff58211c61432d8 Mon Sep 17 00:00:00 2001
From: parra <victor+git@parravidales.es>
Date: Fri, 23 Sep 2022 22:40:18 +0200
Subject: [PATCH 2/5] Updated Drone badge reference
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index eb0bc06..a412e8b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# crypto-reporter
-[](https://drone.cuzo.dev/Parra/crypto-reporter)
+[](https://drone.cuzo.dev/parra/crypto-reporter)
Obtiene y publica precios de criptomonedas.
From 5cb33d6b8747e9fefcb8b42f6634a2ee644b30e4 Mon Sep 17 00:00:00 2001
From: parra <victor+git@parravidales.es>
Date: Thu, 6 Oct 2022 15:38:55 +0200
Subject: [PATCH 3/5] Updated drone badge links
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index a412e8b..05bdead 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# crypto-reporter
-[](https://drone.cuzo.dev/parra/crypto-reporter)
+[](https://ci.cuzo.dev/parra/crypto-reporter)
Obtiene y publica precios de criptomonedas.
From 54fe3e81d5681738312b6150e490f3dae75b7573 Mon Sep 17 00:00:00 2001
From: parra <victor+git@parravidales.es>
Date: Thu, 6 Oct 2022 16:02:11 +0200
Subject: [PATCH 4/5] Updated Drone pipeline
---
.drone.yml | 39 +++++++++++++++++++++++----------------
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/.drone.yml b/.drone.yml
index 33118cf..7f90d34 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,17 +15,19 @@ steps:
auto_tag_suffix: linux-arm
mirror: https://registry.cuzo.dev
username:
- from_secret: DOCKER_REGISTRY_USER
+ from_secret: docker_hub_user
password:
- from_secret: DOCKER_REGISTRY_PASSWORD
+ from_secret: docker_hub_pass
image_pull_secrets:
-- PRIVATE_DOCKER_REGISTRY
+- custom_mirror_registry
trigger:
event:
- push
- tag
+ exclude:
+ - pull_request
---
kind: pipeline
@@ -48,17 +50,19 @@ steps:
auto_tag_suffix: linux-amd64
mirror: https://registry.cuzo.dev
username:
- from_secret: DOCKER_REGISTRY_USER
+ from_secret: docker_hub_user
password:
- from_secret: DOCKER_REGISTRY_PASSWORD
+ from_secret: docker_hub_pass
image_pull_secrets:
-- PRIVATE_DOCKER_REGISTRY
+- custom_mirror_registry
trigger:
event:
- push
- tag
+ exclude:
+ - pull_request
---
kind: pipeline
@@ -78,9 +82,9 @@ steps:
auto_tag: true
ignore_missing: true
username:
- from_secret: DOCKER_REGISTRY_USER
+ from_secret: docker_hub_user
password:
- from_secret: DOCKER_REGISTRY_PASSWORD
+ from_secret: docker_hub_pass
platforms:
- linux/amd64
- linux/arm
@@ -90,12 +94,14 @@ depends_on:
- arm32
image_pull_secrets:
-- PRIVATE_DOCKER_REGISTRY
+- custom_mirror_registry
trigger:
event:
- push
- tag
+ exclude:
+ - pull_request
---
kind: pipeline
@@ -106,10 +112,8 @@ steps:
image: registry.cuzo.dev/plugins/gitea-release
settings:
api_key:
- from_secret: DRONE_API_KEY
+ from_secret: drone_api_key
base_url: https://git.cuzo.dev
- title:
- from_secret: DRONE_SEMVER
when:
ref:
- refs/tags/*
@@ -118,11 +122,12 @@ depends_on:
- manifest
image_pull_secrets:
-- PRIVATE_DOCKER_REGISTRY
+- custom_mirror_registry
trigger:
event:
- tag
+
---
kind: pipeline
type: docker
@@ -135,18 +140,20 @@ steps:
status: [success, failure]
settings:
to:
- from_secret: TG_USER
+ from_secret: tg_user
token:
- from_secret: TG_TOKEN
+ from_secret: tg_password
depends_on:
- manifest
- release
image_pull_secrets:
-- PRIVATE_DOCKER_REGISTRY
+- custom_mirror_registry
trigger:
event:
- push
- tag
+ exclude:
+ - pull_request
From 3fe949143f915065ac4cb62eb0f5a7b3e782d359 Mon Sep 17 00:00:00 2001
From: parra <victor+git@parravidales.es>
Date: Thu, 6 Oct 2022 16:19:04 +0200
Subject: [PATCH 5/5] Fixed base_url in drone docker release pipeline
---
.drone.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.drone.yml b/.drone.yml
index 7f90d34..7871b24 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -113,7 +113,7 @@ steps:
settings:
api_key:
from_secret: drone_api_key
- base_url: https://git.cuzo.dev
+ base_url: https://git.parravidales.es
when:
ref:
- refs/tags/*