diff --git a/docker/RELEASE/README.md b/docker/RELEASE/README.md index 589863a3..d81588b0 100644 --- a/docker/RELEASE/README.md +++ b/docker/RELEASE/README.md @@ -14,8 +14,8 @@ Supported tags and respective `Dockerfile` links : * [pre-requisites_Alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile) ### Releases -* [latest, v0.9.1-SNAPSHOT, ubuntu-18.04](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile) -* [alpine, v0.9.1-SNAPSHOT_alpine, alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/alpine_tomcat-8.5/Dockerfile) +* [latest, v0.9.1, ubuntu-18.04](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile) +* [alpine, v0.9.1_alpine, alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/alpine_tomcat-8.5/Dockerfile) * [v0.9.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.0/docker/RELEASE/Dockerfile), [v0.8.6](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.6/docker/RELEASE/Dockerfile), [v0.8.5](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.5/docker/RELEASE/Dockerfile), [v0.8.4](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.4/docker/RELEASE/Dockerfile), [v0.8.3](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.3/docker/RELEASE/Dockerfile), [v0.8.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.2/docker/RELEASE/Dockerfile), [v0.8.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.1/docker/RELEASE/Dockerfile), [v0.8.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.0/docker/RELEASE/Dockerfile) * [v0.7.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.7.0/docker/RELEASE/Dockerfile), [v0.6.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.6.0/docker/RELEASE/Dockerfile), [v0.5.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.2/docker/RELEASE/Dockerfile) diff --git a/docker/RELEASE/alpine_tomcat-7/Dockerfile b/docker/RELEASE/alpine_tomcat-7/Dockerfile index 8246f5c4..bede10a3 100644 --- a/docker/RELEASE/alpine_tomcat-7/Dockerfile +++ b/docker/RELEASE/alpine_tomcat-7/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp (tomcat7 < jdk7 < alpine 3.7)" \ - org.label-schema.version = "0.9.1-SNAPSHOT" \ + org.label-schema.version = "0.9.1" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder:alpine" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1-SNAPSHOT . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1-SNAPSHOT/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1-SNAPSHOT/contrast-finder-webapp_0.9.1-SNAPSHOT.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/contrast-finder-webapp_0.9.1.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -39,7 +39,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ARG CONTRAST_FINDER_RELEASE="0.9.1" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" diff --git a/docker/RELEASE/alpine_tomcat-8.5/Dockerfile b/docker/RELEASE/alpine_tomcat-8.5/Dockerfile index 0c00a52f..453ff9d0 100644 --- a/docker/RELEASE/alpine_tomcat-8.5/Dockerfile +++ b/docker/RELEASE/alpine_tomcat-8.5/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-8.5 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp (tomcat 8.5 < jdk 8 < alpine 3.7)" \ - org.label-schema.version = "0.9.1-SNAPSHOT" \ + org.label-schema.version = "0.9.1" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder:alpine" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1-SNAPSHOT . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1-SNAPSHOT/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1-SNAPSHOT/contrast-finder-webapp_0.9.1-SNAPSHOT.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/contrast-finder-webapp_0.9.1.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -39,7 +39,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ARG CONTRAST_FINDER_RELEASE="0.9.1" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" diff --git a/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile b/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile index 20e1a24c..6c8fa014 100644 --- a/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile +++ b/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp (Ubuntu 14.04 - Tomcat 7)" \ - org.label-schema.version = "0.9.1-SNAPSHOT" \ + org.label-schema.version = "0.9.1" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1-SNAPSHOT . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1-SNAPSHOT/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1-SNAPSHOT/contrast-finder-webapp_0.9.1-SNAPSHOT.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/contrast-finder-webapp_0.9.1.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -37,7 +37,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ARG CONTRAST_FINDER_RELEASE="0.9.1" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" diff --git a/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile b/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile index 02a823fa..306e0eca 100644 --- a/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile +++ b/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp (Ubuntu 16.04 - Tomcat 7)" \ - org.label-schema.version = "0.9.1-SNAPSHOT" \ + org.label-schema.version = "0.9.1" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1-SNAPSHOT . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1-SNAPSHOT/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1-SNAPSHOT/contrast-finder-webapp_0.9.1-SNAPSHOT.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/contrast-finder-webapp_0.9.1.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -37,7 +37,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ARG CONTRAST_FINDER_RELEASE="0.9.1" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" diff --git a/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile b/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile index 4620befb..744ee7f2 100644 --- a/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile +++ b/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp (Ubuntu 18.04 - Tomcat 8.5, Java 10)" \ - org.label-schema.version = "0.9.1-SNAPSHOT" \ + org.label-schema.version = "0.9.1" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1-SNAPSHOT . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1-SNAPSHOT/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1-SNAPSHOT/contrast-finder-webapp_0.9.1-SNAPSHOT.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/contrast-finder-webapp_0.9.1.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -37,7 +37,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ARG CONTRAST_FINDER_RELEASE="0.9.1" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" diff --git a/docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile b/docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile index f7be6242..10c0644b 100644 --- a/docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile @@ -21,7 +21,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile b/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile index bf5a6ee9..574d5885 100644 --- a/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile @@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-8.5 # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile b/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile index 8c08ed97..7608e3fd 100644 --- a/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile @@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-9 # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile b/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile index 68782a69..56d6000b 100644 --- a/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Debian-9_tomcat-8.5 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile b/docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile index 56e3a2b1..559ed96c 100644 --- a/docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile @@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Debian_tomcat-9_jre9 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" ENV CONF_ENV="debug" # Add contrast-finder .war diff --git a/docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile b/docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile index 884cef18..5ac6da55 100644 --- a/docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile index b57e0c71..7403de11 100644 --- a/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile index 6971c951..41ddbd89 100644 --- a/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-8.0 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile b/docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile index 8e96d126..9b6a2ba8 100644 --- a/docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile @@ -20,7 +20,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile b/docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile index c58ccf2c..63bcfa91 100644 --- a/docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile b/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile index db3f078c..3a951f7a 100644 --- a/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="HSV" diff --git a/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile b/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile index 428249fb..745cecc3 100644 --- a/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" ENV CONF_ENV="debug" # Add contrast-finder .war diff --git a/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile b/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile index e334edc5..ac91c3c3 100644 --- a/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" ENV PIWIK_KEY="9" ENV PIWIK_URL="http://localhost/piwik/" diff --git a/docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile b/docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile index 26ea813a..fec339ae 100644 --- a/docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.1-SNAPSHOT" +ENV CONTRAST_FINDER_RELEASE="0.9.1" ENV SEARCH_ENGINGE="yes" # Add contrast-finder .war diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile b/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile index 90b0f472..96849801 100644 --- a/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (tomcat7 < jdk7 < alpine 3.7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.1-SNAPSHOT" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile b/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile index 5f78c5bf..09766e60 100644 --- a/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (tomcat 8.5 < jdk 8 < alpine 3.7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.1-SNAPSHOT" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile b/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile index e63dfef6..f59412b6 100644 --- a/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile @@ -4,7 +4,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (tomcat 9 < jdk 8 < alpine 3.7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.1-SNAPSHOT" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile b/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile index d7cdc348..858d2070 100644 --- a/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Debian 9 - Tomcat 8.5)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.1-SNAPSHOT" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Debian_tomcat-9_jre9/Dockerfile b/docker/pre-requisites/pre-requisites_Debian_tomcat-9_jre9/Dockerfile index 51afa785..1fb374b9 100644 --- a/docker/pre-requisites/pre-requisites_Debian_tomcat-9_jre9/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Debian_tomcat-9_jre9/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (tomcat 9 < jdk 9 < debian SID)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.1-SNAPSHOT" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile b/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile index 2aff029d..cda7510e 100644 --- a/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 14.04 - Tomcat 7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.1-SNAPSHOT" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile index e16d6046..80907ce8 100644 --- a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 16.04 - Tomcat 7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.1-SNAPSHOT" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile index ccf70169..e2ffd17c 100644 --- a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 16.04 - Tomcat 8.0)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.1-SNAPSHOT" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile b/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile index 0207a7f8..a8e67cc7 100644 --- a/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 18.04 - Tomcat 8.5, Java 10)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.1-SNAPSHOT" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/documentation/en/10_Install_doc/webapp_Installation.md b/documentation/en/10_Install_doc/webapp_Installation.md index e1a580ee..e61e6be2 100644 --- a/documentation/en/10_Install_doc/webapp_Installation.md +++ b/documentation/en/10_Install_doc/webapp_Installation.md @@ -14,7 +14,7 @@ You just need to replace `tomcat7` with `tomcat8` in the following command lines ```bash cd /tmp -wget https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1-SNAPSHOT/contrast-finder-webapp_0.9.1-SNAPSHOT.tar.gz +wget https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/contrast-finder-webapp_0.9.1.tar.gz tar -xzvf contrast-finder-webapp_*.tar.gz cd contrast-finder-webapp_*/ mv -v install/contrast-finder-webapp_*.war contrast-finder.war diff --git a/documentation/pom.xml b/documentation/pom.xml index e261982b..595cc8ac 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -4,11 +4,11 @@ org.asqatasun contrast-finder - 0.9.1-SNAPSHOT + 0.9.1 documentation pom - 0.9.1-SNAPSHOT + 0.9.1 contrast-finder-documentation diff --git a/engine/api/pom.xml b/engine/api/pom.xml index 1059b43e..d835407a 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.9.1-SNAPSHOT + 0.9.1 contrast-finder-api - 0.9.1-SNAPSHOT + 0.9.1 jar api diff --git a/engine/hsv/pom.xml b/engine/hsv/pom.xml index e1deefa5..cf52e5fc 100644 --- a/engine/hsv/pom.xml +++ b/engine/hsv/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.9.1-SNAPSHOT + 0.9.1 contrast-finder-hsv - 0.9.1-SNAPSHOT + 0.9.1 jar hsv diff --git a/engine/impl/pom.xml b/engine/impl/pom.xml index d56f4b2d..9deaf245 100644 --- a/engine/impl/pom.xml +++ b/engine/impl/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.9.1-SNAPSHOT + 0.9.1 contrast-finder-impl - 0.9.1-SNAPSHOT + 0.9.1 jar impl diff --git a/engine/pom.xml b/engine/pom.xml index 6196dc9c..598cc2bd 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.9.1-SNAPSHOT + 0.9.1 engine - 0.9.1-SNAPSHOT + 0.9.1 pom contrast-finder-engine diff --git a/engine/utils/pom.xml b/engine/utils/pom.xml index 22696633..a1a92957 100644 --- a/engine/utils/pom.xml +++ b/engine/utils/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.9.1-SNAPSHOT + 0.9.1 contrast-finder-utils - 0.9.1-SNAPSHOT + 0.9.1 jar utils diff --git a/pom.xml b/pom.xml index 38b2e3fb..645c7879 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.asqatasun contrast-finder pom - 0.9.1-SNAPSHOT + 0.9.1 Contrast-Finder diff --git a/webapp/pom.xml b/webapp/pom.xml index fac0103c..2bbf92a0 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.9.1-SNAPSHOT + 0.9.1 webapp - 0.9.1-SNAPSHOT + 0.9.1 war contrast-finder-webapp diff --git a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf index 61644f31..8298ad4f 100644 --- a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf @@ -2,7 +2,7 @@ <%@ page pageEncoding="UTF-8" %> <%-- APP version --%> - + <%-- APP Name --%>