From b7ae1673819b007ac9077b1d9856c15710cb668a Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Mon, 9 Mar 2020 18:22:24 +0100 Subject: [PATCH 1/3] Prepare next dev release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 928be94..70318b1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "confusionflow", "description": "Visualize learning dynamics in multi-class image classifiers (e.g., convolutional neural networks)", "homepage": "https://confusionflow.org", - "version": "0.2.0", + "version": "0.2.1-SNAPSHOT", "author": { "name": "The ConfusionFlow Team", "email": "gfrogat@gmail.com", From d1568e5d5bf09d3213d8f390223c3b9e4fa7c207 Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Mon, 9 Mar 2020 18:49:17 +0100 Subject: [PATCH 2/3] Revert Dockerfile to fix api in ngnix config --- deploy/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index bb704fe..af2902a 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -4,6 +4,6 @@ LABEL maintainer="contact@caleydo.org" ENV PHOVEA_API_SERVER=api ENV PHOVEA_NGINX_PORT=80 -#COPY ./deploy/nginx-default.conf /etc/nginx/conf.d/default.conf -#CMD sed -i -e "s/PHOVEA_API_SERVER/${PHOVEA_API_SERVER-api}/g" /etc/nginx/conf.d/default.conf && sed -i -e "s/PHOVEA_NGINX_PORT/${PHOVEA_NGINX_PORT-api}/g" /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;' +COPY ./deploy/nginx-default.conf /etc/nginx/conf.d/default.conf +CMD sed -i -e "s/PHOVEA_API_SERVER/${PHOVEA_API_SERVER-api}/g" /etc/nginx/conf.d/default.conf && sed -i -e "s/PHOVEA_NGINX_PORT/${PHOVEA_NGINX_PORT-api}/g" /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;' COPY ./build /usr/share/nginx/html From 19323d1318da4639b5365192580180b7acf0e68c Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Mon, 9 Mar 2020 18:57:40 +0100 Subject: [PATCH 3/3] Release 0.2.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 70318b1..437d2c3 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "confusionflow", "description": "Visualize learning dynamics in multi-class image classifiers (e.g., convolutional neural networks)", "homepage": "https://confusionflow.org", - "version": "0.2.1-SNAPSHOT", + "version": "0.2.1", "author": { "name": "The ConfusionFlow Team", "email": "gfrogat@gmail.com",