From 4628cf1544451fb590fb943446fc3ca79bbad447 Mon Sep 17 00:00:00 2001 From: Fionn Date: Mon, 1 May 2023 17:16:39 +0200 Subject: [PATCH 1/2] update drone to use other registry --- .drone.yml | 37 ++++++++++++++++--------------------- README.md | 4 ++-- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/.drone.yml b/.drone.yml index 602634b..0e8f87d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,12 +3,12 @@ type: docker name: build dev steps: - - name: build and push image + - name: build for staging image: plugins/docker settings: dockerfile: Dockerfile - registry: git.fsisp.de - repo: git.fsisp.de/fionn/iassure-wx + registry: hub.fsisp.de + repo: hub.fsisp.de/library/iassure-wx username: from_secret: reg_username password: @@ -16,32 +16,27 @@ steps: tags: - dev - '${DRONE_COMMIT:0:8}' + when: + branch: + - dev + - develop + event: + - push -trigger: - branch: - - dev - - develop - ---- -kind: pipeline -type: docker -name: build master - -steps: - - name: build and push image + - name: build for production image: plugins/docker settings: dockerfile: Dockerfile - registry: git.fsisp.de - repo: git.fsisp.de/fionn/iassure-wx + registry: hub.fsisp.de + repo: hub.fsisp.de/library/iassure-wx username: from_secret: reg_username password: from_secret: reg_password tags: - latest + - '${DRONE_TAG}' - '${DRONE_COMMIT:0:8}' - -trigger: - branch: - - main + when: + event: + - tag diff --git a/README.md b/README.md index ee6a0fe..b0db093 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This service is designed to gather weather data to be used by [IASsure](https:// ## Installation/Deployment -IASsure-WX can be installed using docker. The image is available at `git.fsisp.de/fionn/iassure-wx`. +IASsure-WX can be installed using docker. The image is available at `hub.fsisp.de/library/iassure-wx`. Tags: - `latest` - The newest recommended build, built from `main` @@ -29,6 +29,6 @@ BASE_PATH=/api # defines ips that are allowed as proxy ips # See http://expressjs.com/en/guide/behind-proxies.html TRUST_PROXY= -# set to true to disable /api-Endpoint. will also diable frontend. +# set to true to disable /api-Endpoint. will also disable frontend. DISABLE_DEFAULT_API_ENDPOINT= ``` From 4c1a7a5a51e6711bae886c4cf97eea5c4ffc587b Mon Sep 17 00:00:00 2001 From: Fionn Date: Mon, 1 May 2023 17:18:13 +0200 Subject: [PATCH 2/2] bump version to 1.2.0 --- backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index 9edd42e..50facd0 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "app", - "version": "1.1.0", + "version": "1.2.0", "description": "", "main": "index.js", "type": "module",