Skip to content

Commit

Permalink
set version to 0.8.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@dzc34
dzc34 committed Feb 21, 2018
1 parent a410a05 commit c3e97ed
Show file tree
Hide file tree
Showing 47 changed files with 80 additions and 92 deletions.
14 changes: 1 addition & 13 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
# CHANGELOG

Contrast-Finder 0.8.5, 2018-02-xx
Contrast-Finder 0.8.5, 2018-02-21
---------------------------------

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

### New Feature
none

### Security
none

### Outdated dependencies
- [#130 - Updated .jsp file, form tag: use "modelAttribute" instead of deprecated "commandName"](https://github.com/Asqatasun/Contrast-Finder/issues/130)
- [#138 - Upgraded markdown-page-generator-plugin (2.1.0 instead of 2.0.1)](https://github.com/Asqatasun/Contrast-Finder/issues/138)
Expand All @@ -28,18 +22,12 @@ none
- [#127 - Webapp: added contribute.json file](https://github.com/Asqatasun/Contrast-Finder/issues/127)
- [#133 - Webapp: allowed the HTTP header "Cache-Control: immutable" for asset files (css, js, png)](https://github.com/Asqatasun/Contrast-Finder/issues/133)

### Refactoring
none

### Configuration
- [#131 - Changed default docker image: ubuntu-16.04_tomcat-7 instead of ubuntu-14.04_tomcat-7](https://github.com/Asqatasun/Contrast-Finder/issues/131)

### Documentation
- Updated prerequisites and install documentation

### Task
none


Contrast-Finder 0.8.4, 2018-01-24
---------------------------------
Expand Down
6 changes: 3 additions & 3 deletions docker/RELEASE/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,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.8.5-SNAPSHOT, ubuntu-14.04](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile)
* [alpine, v0.8.5-SNAPSHOT_alpine, alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/alpine_tomcat-8.5/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)
* [latest, v0.8.5, ubuntu-16.04](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile)
* [alpine, v0.8.5_alpine, alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/alpine_tomcat-8.5/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)

## How to use this image
Expand Down
10 changes: 5 additions & 5 deletions docker/RELEASE/alpine_tomcat-7/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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.8.5-SNAPSHOT" \
org.label-schema.version = "0.8.5" \
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" \
Expand All @@ -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.8.5-SNAPSHOT .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5-SNAPSHOT/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5-SNAPSHOT/contrast-finder-webapp_0.8.5-SNAPSHOT.tar.gz .
# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.5 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5/contrast-finder-webapp_0.8.5.tar.gz .
#
# --- Launch a container
# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder
Expand All @@ -39,7 +39,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1"
###################################################################

# build variables
ARG CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ARG CONTRAST_FINDER_RELEASE="0.8.5"
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"

Expand Down
10 changes: 5 additions & 5 deletions docker/RELEASE/alpine_tomcat-8.5/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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.8.5-SNAPSHOT" \
org.label-schema.version = "0.8.5" \
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" \
Expand All @@ -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.8.5-SNAPSHOT .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5-SNAPSHOT/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5-SNAPSHOT/contrast-finder-webapp_0.8.5-SNAPSHOT.tar.gz .
# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.5 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5/contrast-finder-webapp_0.8.5.tar.gz .
#
# --- Launch a container
# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder
Expand All @@ -39,7 +39,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1"
###################################################################

# build variables
ARG CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ARG CONTRAST_FINDER_RELEASE="0.8.5"
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"

Expand Down
10 changes: 5 additions & 5 deletions docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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.8.5-SNAPSHOT" \
org.label-schema.version = "0.8.5" \
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" \
Expand All @@ -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.8.5-SNAPSHOT .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5-SNAPSHOT/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5-SNAPSHOT/contrast-finder-webapp_0.8.5-SNAPSHOT.tar.gz .
# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.5 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5/contrast-finder-webapp_0.8.5.tar.gz .
#
# --- Launch a container
# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder
Expand All @@ -37,7 +37,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1"
###################################################################

# build variables
ARG CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ARG CONTRAST_FINDER_RELEASE="0.8.5"
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"

Expand Down
10 changes: 5 additions & 5 deletions docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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.8.5-SNAPSHOT" \
org.label-schema.version = "0.8.5" \
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" \
Expand All @@ -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.8.5-SNAPSHOT .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5-SNAPSHOT/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5-SNAPSHOT/contrast-finder-webapp_0.8.5-SNAPSHOT.tar.gz .
# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.5 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5/contrast-finder-webapp_0.8.5.tar.gz .
#
# --- Launch a container
# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder
Expand All @@ -37,7 +37,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1"
###################################################################

# build variables
ARG CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ARG CONTRAST_FINDER_RELEASE="0.8.5"
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"

Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-8.5


# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-9


# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Debian-9_tomcat-8.5
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Debian_tomcat-9_jre9
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"
ENV CONF_ENV="debug"

# Add contrast-finder .war
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-8.0
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"
ENV CONF_DEFAULT_ALGO="Rgb"
# ENV CONF_DEFAULT_ALGO="Rgb"
# ENV CONF_DEFAULT_ALGO="HSV"
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"
ENV CONF_ENV="debug"

# Add contrast-finder .war
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"
ENV PIWIK_KEY="9"
ENV PIWIK_URL="http://localhost/piwik/"

Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"
ENV SEARCH_ENGINGE="yes"

# Add contrast-finder .war
Expand Down
4 changes: 2 additions & 2 deletions ...st_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_14.04_tomcat7_full/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.5-SNAPSHOT"
org.label-schema.version = "0.8.5"
# ----> documentation http://label-schema.org/

# #### usage ######################################################
Expand Down Expand Up @@ -79,7 +79,7 @@ HEALTHCHECK --timeout=3s \
######################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"

# Add contrast-finder .war
ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root
Expand Down
4 changes: 2 additions & 2 deletions ...st_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat7_full/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.5-SNAPSHOT"
org.label-schema.version = "0.8.5"
# ----> documentation http://label-schema.org/

# #### usage ######################################################
Expand Down Expand Up @@ -79,7 +79,7 @@ HEALTHCHECK --timeout=3s \
######################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT"
ENV CONTRAST_FINDER_RELEASE="0.8.5"

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

0 comments on commit c3e97ed

Please sign in to comment.