Skip to content
Permalink
Browse files

Contrast-Finder v0.10.0

-----------------------

  set version to 0.9.6
  FEAT: added link to the about page
  FIX: update maven-site-plugin (3.7.1 --> 3.8.2)
  FIX: update maven-compiler-plugin (3.8.0 --> 3.8.1)
  FIX: update maven-jar-plugin (3.1.1 --> 3.2.0)
  FIX: update maven-javadoc-plugin (3.1.0  ---> 3.1.1)
  FIX: update maven-surefire-plugin (3.0.0-M3 ---> 3.0.0-M4)
  FIX: update maven-war-plugin (3.2.2 --> 3.2.3)
  FIX: update build-helper-maven-plugin (3.0.0 ---> 3.1.0)
  FIX: update jacoco-maven-plugin (0.8.3  -->  0.8.5)
  FIX: update dependency-check-maven (5.0.0-M2 ---> 5.3.1)
  FIX: update maven-checkstyle-plugin  (3.0.0 --> 3.1.1)
  FIX: update maven-dependency-plugin (3.1.1 --> 3.1.2)
  FIX: update jdeb (1.7 --> 1.8)
  FIX: update spring-security (4.2.12 --> 4.2.14)
  FIX: update spring (4.3.23 --> 4.3.26)
  typo humans.txt
  FIX: update markdown-page-generator-plugin  (2.1.0 ---> 2.2.0)
  FIX: update junit (4.12 --> 4.13)
  FIX: update commons-collections4 (4.3 --> 4.4)
  ...
  FEAT(i18n): enable the Occitan translation
  ...
  i18n - Initialized files for Polish (PL) translation
  • Loading branch information
dzc34 committed Mar 25, 2020
2 parents b3d5375 + 13f9c3b commit 7e22a4944192981fcf04b60f944f5310ce716a56
Showing with 767 additions and 122 deletions.
  1. +33 −0 CHANGELOG.md
  2. +3 −3 dist./debian_package/pom.xml
  3. +2 −2 dist./pom.xml
  4. +3 −3 docker/RELEASE/README.md
  5. +5 −5 docker/RELEASE/alpine_tomcat-7/Dockerfile
  6. +5 −5 docker/RELEASE/alpine_tomcat-8.5/Dockerfile
  7. +5 −5 docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile
  8. +5 −5 docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile
  9. +5 −5 docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile
  10. +1 −1 docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile
  11. +1 −1 docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile
  12. +1 −1 docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile
  13. +1 −1 docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile
  14. +1 −1 docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile
  15. +1 −1 docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile
  16. +1 −1 docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile
  17. +1 −1 docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile
  18. +1 −1 docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile
  19. +1 −1 docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile
  20. +1 −1 docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile
  21. +1 −1 docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile
  22. +1 −1 docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile
  23. +1 −1 docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile
  24. +1 −1 docker/SNAPSHOT-local/test_config-file/50.loggingColorsResult_compact/Dockerfile
  25. +1 −1 docker/SNAPSHOT-local/test_config-file/51.loggingColorsResult_full/Dockerfile
  26. +1 −1 docker/SNAPSHOT-local/test_config-file/60.languages/Dockerfile
  27. +1 −1 docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile
  28. +1 −1 docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile
  29. +1 −1 docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile
  30. +1 −1 docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile
  31. +1 −1 docker/pre-requisites/pre-requisites_Debian_tomcat-9_jre9/Dockerfile
  32. +1 −1 docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile
  33. +1 −1 docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile
  34. +1 −1 docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile
  35. +1 −1 docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile
  36. +1 −1 documentation/en/30_Contributor_doc/README.md
  37. +111 −22 documentation/en/30_Contributor_doc/i18n/README.md
  38. +2 −2 documentation/pom.xml
  39. +2 −2 engine/api/pom.xml
  40. +2 −2 engine/hsv/pom.xml
  41. +2 −2 engine/impl/pom.xml
  42. +2 −2 engine/pom.xml
  43. +2 −2 engine/utils/pom.xml
  44. +14 −15 pom.xml
  45. +5 −5 webapp/pom.xml
  46. +4 −2 webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/AbstractController.java
  47. +1 −1 webapp/src/main/resources/conf/contrast-finder.conf.dist
  48. +1 −1 webapp/src/main/resources/i18n/contrast-finder_utf8_fr.properties
  49. +270 −0 webapp/src/main/resources/i18n/contrast-finder_utf8_oc.properties
  50. +242 −0 webapp/src/main/resources/i18n/contrast-finder_utf8_pl.properties
  51. +4 −2 webapp/src/main/webapp/WEB-INF/template/footer.jspf
  52. +1 −1 webapp/src/main/webapp/WEB-INF/template/template_variables.jspf
  53. +9 −1 webapp/src/main/webapp/humans.txt
@@ -1,5 +1,38 @@
# CHANGELOG

Contrast-Finder 0.10.0, 2020-03-25
---------------------------------

Upgrade-o-meter: just replace the .war file and restart Tomcat

Thanks to:
- @Quenty31 PR #223 Polish translation
- @zwiastunsw PR #220 Occitan translation

### New Feature
- [#220 - i18n: add Polish](https://github.com/Asqatasun/Contrast-Finder/issues/220)
- [#223 - i18n: add Occitan](https://github.com/Asqatasun/Contrast-Finder/issues/223)

### Outdated dependencies
- [#241 - Upgraded maven-site-plugin (3.7.1 --> 3.8.2)](https://github.com/Asqatasun/Contrast-Finder/issues/241)
- [#240 - Upgraded maven-compiler-plugin (3.8.0 --> 3.8.1)](https://github.com/Asqatasun/Contrast-Finder/issues/240)
- [#239 - Upgraded maven-jar-plugin (3.1.1 --> 3.2.0)](https://github.com/Asqatasun/Contrast-Finder/issues/239)
- [#238 - Upgraded maven-javadoc-plugin (3.1.0 ---> 3.1.1)](https://github.com/Asqatasun/Contrast-Finder/issues/238)
- [#237 - Upgraded maven-surefire-plugin (3.0.0-M3 ---> 3.0.0-M4)](https://github.com/Asqatasun/Contrast-Finder/issues/237)
- [#236 - Upgraded maven-war-plugin (3.2.2 --> 3.2.3)](https://github.com/Asqatasun/Contrast-Finder/issues/236)
- [#235 - Upgraded build-helper-maven-plugin (3.0.0 ---> 3.1.0)](https://github.com/Asqatasun/Contrast-Finder/issues/235)
- [#234 - Upgraded jacoco-maven-plugin (0.8.3 --> 0.8.5)](https://github.com/Asqatasun/Contrast-Finder/issues/234)
- [#233 - Upgraded dependency-check-maven (5.0.0-M2 ---> 5.3.1)](https://github.com/Asqatasun/Contrast-Finder/issues/233)
- [#232 - Upgraded maven-checkstyle-plugin (3.0.0 --> 3.1.1)](https://github.com/Asqatasun/Contrast-Finder/issues/232)
- [#231 - Upgraded maven-dependency-plugin (3.1.1 --> 3.1.2)](https://github.com/Asqatasun/Contrast-Finder/issues/231)
- [#230 - Upgraded jdeb (1.7 --> 1.8)](https://github.com/Asqatasun/Contrast-Finder/issues/230)
- [#229 - Upgraded spring-security (4.2.12 --> 4.2.14)](https://github.com/Asqatasun/Contrast-Finder/issues/229)
- [#228 - Upgraded spring (4.3.23 --> 4.3.26)](https://github.com/Asqatasun/Contrast-Finder/issues/228)
- [#227 - Upgraded markdown-page-generator-plugin (2.1.0 ---> 2.2.0)](https://github.com/Asqatasun/Contrast-Finder/issues/27)
- [#226 - Upgraded junit (4.12 --> 4.13)](https://github.com/Asqatasun/Contrast-Finder/issues/26)
- [#225 - Upgraded commons-collections4 (4.3 --> 4.4)](https://github.com/Asqatasun/Contrast-Finder/issues/25)


Contrast-Finder 0.9.5, 2019-05-01
---------------------------------

@@ -4,10 +4,10 @@
<parent>
<groupId>org.asqatasun</groupId>
<artifactId>dist</artifactId>
<version>0.9.5</version>
<version>0.10.0</version>
</parent>
<artifactId>contrast-finder-dist_debian-packages</artifactId>
<version>0.9.5</version>
<version>0.10.0</version>
<packaging>jar</packaging>
<name>contrast-finder-dist_debian-packages</name>
<licenses>
@@ -27,7 +27,7 @@
<endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>

<!-- Plugin Versions -->
<jdeb.version>1.7</jdeb.version> <!-- need Maven with Jdk-8 -->
<jdeb.version>1.8</jdeb.version> <!-- need Maven with Jdk-8 -->
</properties>


@@ -20,10 +20,10 @@
<parent>
<groupId>org.asqatasun</groupId>
<artifactId>contrast-finder</artifactId>
<version>0.9.5</version>
<version>0.10.0</version>
</parent>
<artifactId>dist</artifactId>
<version>0.9.5</version>
<version>0.10.0</version>
<packaging>pom</packaging>
<name>contrast-finder-dist</name>
<licenses>
@@ -14,9 +14,9 @@ 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.5, ubuntu-18.04](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile)
* [alpine, v0.9.5_alpine, alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/alpine_tomcat-8.5/Dockerfile)
* [v0.9.4](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.4/docker/RELEASE/Dockerfile), [v0.9.3](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.3/docker/RELEASE/Dockerfile), [v0.9.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.2/docker/RELEASE/Dockerfile), [v0.9.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.1/docker/RELEASE/Dockerfile), [v0.9.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.0/docker/RELEASE/Dockerfile),
* [latest, v0.10.0, ubuntu-18.04](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile)
* [alpine, v0.10.0_alpine, alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/alpine_tomcat-8.5/Dockerfile)
* [v0.9.5](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.5/docker/RELEASE/Dockerfile), [v0.9.4](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.4/docker/RELEASE/Dockerfile), [v0.9.3](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.3/docker/RELEASE/Dockerfile), [v0.9.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.2/docker/RELEASE/Dockerfile), [v0.9.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.1/docker/RELEASE/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.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)

## How to use this image
@@ -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.5" \
org.label-schema.version = "0.10.0" \
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.5 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.5/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.5/contrast-finder-webapp_0.9.5.tar.gz .
# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.10.0 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.10.0/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.10.0/contrast-finder-webapp_0.10.0.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.5"
ARG CONTRAST_FINDER_RELEASE="0.10.0"
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"

@@ -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.5" \
org.label-schema.version = "0.10.0" \
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.5 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.5/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.5/contrast-finder-webapp_0.9.5.tar.gz .
# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.10.0 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.10.0/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.10.0/contrast-finder-webapp_0.10.0.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.5"
ARG CONTRAST_FINDER_RELEASE="0.10.0"
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"

@@ -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.5" \
org.label-schema.version = "0.10.0" \
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.5 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.5/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.5/contrast-finder-webapp_0.9.5.tar.gz .
# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.10.0 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.10.0/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.10.0/contrast-finder-webapp_0.10.0.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.5"
ARG CONTRAST_FINDER_RELEASE="0.10.0"
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"

@@ -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.5" \
org.label-schema.version = "0.10.0" \
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.5 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.5/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.5/contrast-finder-webapp_0.9.5.tar.gz .
# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.10.0 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.10.0/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.10.0/contrast-finder-webapp_0.10.0.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.5"
ARG CONTRAST_FINDER_RELEASE="0.10.0"
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"

@@ -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.5" \
org.label-schema.version = "0.10.0" \
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.5 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.5/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.5/contrast-finder-webapp_0.9.5.tar.gz .
# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.10.0 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.10.0/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.10.0/contrast-finder-webapp_0.10.0.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.5"
ARG CONTRAST_FINDER_RELEASE="0.10.0"
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"

@@ -21,7 +21,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.9.5"
ENV CONTRAST_FINDER_RELEASE="0.10.0"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
@@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-8.5


# environment variables
ENV CONTRAST_FINDER_RELEASE="0.9.5"
ENV CONTRAST_FINDER_RELEASE="0.10.0"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
@@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-9


# environment variables
ENV CONTRAST_FINDER_RELEASE="0.9.5"
ENV CONTRAST_FINDER_RELEASE="0.10.0"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
@@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Debian-9_tomcat-8.5
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.9.5"
ENV CONTRAST_FINDER_RELEASE="0.10.0"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
@@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Debian_tomcat-9_jre9
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.9.5"
ENV CONTRAST_FINDER_RELEASE="0.10.0"
ENV CONF_ENV="debug"

# Add contrast-finder .war
@@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.9.5"
ENV CONTRAST_FINDER_RELEASE="0.10.0"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
@@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.9.5"
ENV CONTRAST_FINDER_RELEASE="0.10.0"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root

0 comments on commit 7e22a49

Please sign in to comment.
You can’t perform that action at this time.