From 72d6140d5f693c2a5fc82732d4a1beb0a2699715 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 24 Jan 2018 04:35:56 +0100 Subject: [PATCH 01/22] set version to 0.8.5-SNAPSHOT --- CHANGELOG.md | 32 ++++++++++++ docker/RELEASE/README.md | 4 +- docker/RELEASE/alpine_tomcat-7/Dockerfile | 10 ++-- docker/RELEASE/alpine_tomcat-8.5/Dockerfile | 10 ++-- .../RELEASE/ubuntu-14.04_tomcat-7/Dockerfile | 10 ++-- .../RELEASE/ubuntu-16.04_tomcat-7/Dockerfile | 10 ++-- .../distrib/alpine_tomcat-7/Dockerfile | 2 +- .../distrib/alpine_tomcat-8.5/Dockerfile | 2 +- .../distrib/debian-9_tomcat-8.5/Dockerfile | 2 +- .../distrib/fedora-27_tomcat-8.0/Dockerfile | 51 +++++++++++++++++++ .../distrib/ubuntu-14.04_tomcat-7/Dockerfile | 2 +- .../distrib/ubuntu-16.04_tomcat-7/Dockerfile | 2 +- .../ubuntu-16.04_tomcat-8.0/Dockerfile | 2 +- .../ubuntu-18.04_tomcat-8.5/Dockerfile | 2 +- .../01.no.config.file/Dockerfile | 2 +- .../10.default.algo/Dockerfile | 2 +- .../test_config-file/20.debug.env/Dockerfile | 2 +- .../test_config-file/30.piwik/Dockerfile | 2 +- .../Ubuntu_14.04_tomcat7_full/Dockerfile | 4 +- .../Ubuntu_16.04_tomcat7_full/Dockerfile | 4 +- .../Ubuntu_16.04_tomcat8_full/Dockerfile | 4 +- .../Ubuntu_18.04_tomcat8_full/Dockerfile | 4 +- .../test_tomcat-7-8/README_v1.txt | 48 +++++++++++++++++ .../Ubuntu_14.04_tomcat7_full/Dockerfile | 4 +- .../Ubuntu_16.04_tomcat7_full/Dockerfile | 4 +- .../Ubuntu_16.04_tomcat8_full/Dockerfile | 4 +- .../Ubuntu_18.04_tomcat8_full/Dockerfile | 4 +- .../pre-requisites_Alpine_tomcat-7/Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../en/10_Install_doc/webapp_Installation.md | 2 +- documentation/pom.xml | 4 +- engine/api/pom.xml | 4 +- engine/hsv/pom.xml | 4 +- engine/impl/pom.xml | 4 +- engine/pom.xml | 4 +- engine/utils/pom.xml | 4 +- pom.xml | 2 +- webapp/pom.xml | 4 +- .../WEB-INF/template/template_variables.jspf | 2 +- 44 files changed, 204 insertions(+), 73 deletions(-) create mode 100644 docker/SNAPSHOT-local/distrib/fedora-27_tomcat-8.0/Dockerfile create mode 100644 docker/SNAPSHOT-local/test_tomcat-7-8/README_v1.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index f5eb1bbf..b4378806 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,37 @@ # CHANGELOG +Contrast-Finder 0.8.5, 2018-xx-xx +--------------------------------- + +Upgrade-o-meter: just replace the .war file and restart Tomcat + +### New Feature +none + +### Security +none + +### Outdated dependencies +none + +### Bug +none + +### Improvement +none + +### Refactoring +none + +### Configuration +none + +### Documentation +none + +### Task +none + Contrast-Finder 0.8.4, 2018-01-24 --------------------------------- diff --git a/docker/RELEASE/README.md b/docker/RELEASE/README.md index fdda931e..7bf04ba2 100644 --- a/docker/RELEASE/README.md +++ b/docker/RELEASE/README.md @@ -13,8 +13,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.8.4, ubuntu-14.04](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile) -* [alpine, v0.8.4_alpine, alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/alpine_tomcat-8.5/Dockerfile) +* [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) * [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 46cc8468..84fffe88 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.8.4" \ + org.label-schema.version = "0.8.5-SNAPSHOT" \ 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.8.4 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.4/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.4/contrast-finder-webapp_0.8.4.tar.gz . +# 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 . # # --- 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.8.4" +ARG CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" 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 b0264631..37f2c0ea 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.8.4" \ + org.label-schema.version = "0.8.5-SNAPSHOT" \ 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.8.4 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.4/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.4/contrast-finder-webapp_0.8.4.tar.gz . +# 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 . # # --- 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.8.4" +ARG CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" 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 9ad14c24..1221e36b 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.8.4" \ + org.label-schema.version = "0.8.5-SNAPSHOT" \ 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.8.4 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.4/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.4/contrast-finder-webapp_0.8.4.tar.gz . +# 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 . # # --- 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.8.4" +ARG CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" 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 a31abc8d..52db9096 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.8.4" \ + org.label-schema.version = "0.8.5-SNAPSHOT" \ 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.8.4 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.4/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.4/contrast-finder-webapp_0.8.4.tar.gz . +# 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 . # # --- 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.8.4" +ARG CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" 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 16f95129..b19d88f4 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.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # 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 e8fd935e..ef352cc5 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.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # 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 f3dd2c00..c98a4c0e 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.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/fedora-27_tomcat-8.0/Dockerfile b/docker/SNAPSHOT-local/distrib/fedora-27_tomcat-8.0/Dockerfile new file mode 100644 index 00000000..6d2a3da6 --- /dev/null +++ b/docker/SNAPSHOT-local/distrib/fedora-27_tomcat-8.0/Dockerfile @@ -0,0 +1,51 @@ +FROM asqatasun/contrast-finder:pre-requisites_Fedora-27_tomcat-8.0 + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t asqatasun/contrast-finder:SNAPSHOT_local . +# +# --- Launch a container +# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder:SNAPSHOT_local +# +# --- Playing with this docker image +# docker exec -ti contrast.finder /bin/cat /softwares-version.txt +# docker exec -ti contrast.finder /bin/bash +# docker logs -f contrast.finder +# +# #### FROM ###################################################### +# asqatasun/contrast-finder:pre-requisites_Fedora-27_tomcat-8.0 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Fedora-27_tomcat-8.0/Dockerfile +# |-- fedora:27 https://github.com/fedora-cloud/docker-brew-fedora/blob/27/x86_64/Dockerfile +################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" + +# Add contrast-finder .war +ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root + +# Install contrast-finder +RUN cd /root/contrast-*/install/ && \ + mv -v contrast-*.war contrast-finder.war && \ + mv -v contrast-*.war /var/lib/tomcat/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "--- Logs -----------" >> ${INFO_FILE} && \ + echo "${TOMCAT_LOG}" >> ${INFO_FILE} && \ + echo "${LOG_FILE}" >> ${INFO_FILE} && \ + echo "--------------------" >> ${INFO_FILE} && \ + cat ${INFO_FILE} > ${LOG_FILE} && echo "-- Install: Ok" + + +# Health Check of the Docker Container +# ----> see asqatasun/contrast-finder:pre-requisites_Fedora-27_tomcat-8.0 + +# /usr/sbin/tomcat start ; \ + + +CMD echo "BANCO" ; \ + systemctl start tomcat ; \ + tail -f -n 50 ${TOMCAT_LOG} \ + ${LOG_FILE} 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 6145b4d4..7a8615b5 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.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # 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 95394ae0..dfabe2b2 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.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # 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 65c56c49..59b6d6d5 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.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # 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 45ff4ca0..d58cd895 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.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # 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 56026f58..d79b471f 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-14.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # 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 78d1fe79..9bc04d12 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-14.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" 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 b455538b..ada5ab0d 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-14.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" 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 480b36ac..d8c4fabe 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-14.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" ENV PIWIK_KEY="9" ENV PIWIK_URL="http://localhost/piwik/" diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_14.04_tomcat7_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_14.04_tomcat7_full/Dockerfile index 9ebb136c..048a0180 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_14.04_tomcat7_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_14.04_tomcat7_full/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.8.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -79,7 +79,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat7_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat7_full/Dockerfile index 46509012..761f5d32 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat7_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat7_full/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.8.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -79,7 +79,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat8_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat8_full/Dockerfile index 3b48ce6b..8255e98e 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat8_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat8_full/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)" \ 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.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -79,7 +79,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_18.04_tomcat8_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_18.04_tomcat8_full/Dockerfile index f7256b5e..d8a4ab6c 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_18.04_tomcat8_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_18.04_tomcat8_full/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)" \ 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.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -79,7 +79,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/README_v1.txt b/docker/SNAPSHOT-local/test_tomcat-7-8/README_v1.txt new file mode 100644 index 00000000..80e5d4d3 --- /dev/null +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/README_v1.txt @@ -0,0 +1,48 @@ +---- avant suppression libspring-instrument-java --------------------------------- + + v0.8.3 150 MB + v0.8.2 146 MB +pre-requisites_Alpine_tomcat-7 80 MB ---> 76 MB +pre-requisites_Ubuntu-16.04 115 MB ---> 107 MB +pre-requisites_Ubuntu-14.04 141 MB ---> 138 MB +pre-requisites_from-Ubuntu 141 MB ---> 138 MB +------------------------------------- + + + + + + + test: + - Build-Jdk: 1.8 @@@ IN PROGRESSS + - Build-Jdk: 1.7 @@@ TODO + check log @@@ TODO + + +Build-Jdk: 1.8.0_151 +---------------------------------------------- + +Docker ubuntu:14.04 Tomcat 7 + ----> libspring-instrument-java not needed + +Docker ubuntu:16.04 Tomcat 7 + ----> libspring-instrument-java not needed + +Docker ubuntu:18.04 Tomcat 8.5 (next Ubuntu LTS) + ----> libspring-instrument-java not needed + + +Build-Jdk: 1.7.0_151 +---------------------------------------------- + +Docker ubuntu:14.04 Tomcat 7 + ----> libspring-instrument-java not needed + +Docker ubuntu:16.04 Tomcat 7 + ----> libspring-instrument-java not needed + +Docker ubuntu:16.04 Tomcat 8.0 + -v2---> libspring-instrument-java declared in context.xml + +Docker ubuntu:18.04 Tomcat 8.5 (next Ubuntu LTS) + ----> libspring-instrument-java not needed diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full/Dockerfile index 5e993da5..845e0c0e 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full/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.8.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -76,7 +76,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat7_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat7_full/Dockerfile index 24d75615..2be0da50 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat7_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat7_full/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.8.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -76,7 +76,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat8_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat8_full/Dockerfile index d14b2c0e..1b78d4f9 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat8_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat8_full/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)" \ 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.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -76,7 +76,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_18.04_tomcat8_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_18.04_tomcat8_full/Dockerfile index 69227801..405fba7a 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_18.04_tomcat8_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_18.04_tomcat8_full/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)" \ 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.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -76,7 +76,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile b/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile index b2c65fe7..0032e2fb 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.8.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> 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 75dcee8f..b64514bf 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.8.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> 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 6361606a..489040a5 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.8.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> 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 8c1fd772..49487ef9 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.8.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> 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 aac705e4..5145f0a0 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.8.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> 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 aa129b11..3adbf5ad 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.8.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> 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 99d2056c..adefbbcc 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)" \ 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.4" + org.label-schema.version = "0.8.5-SNAPSHOT" # ----> 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 7cd0ff50..80571e14 100644 --- a/documentation/en/10_Install_doc/webapp_Installation.md +++ b/documentation/en/10_Install_doc/webapp_Installation.md @@ -11,7 +11,7 @@ Once you've built, let say you have Tomcat 7 (change the number if you have Tomc ```bash cd /tmp -wget https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.4/contrast-finder-webapp_0.8.4.tar.gz +wget https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.5-SNAPSHOT/contrast-finder-webapp_0.8.5-SNAPSHOT.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 072082fc..0c7d149d 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -4,11 +4,11 @@ org.asqatasun contrast-finder - 0.8.4 + 0.8.5-SNAPSHOT documentation pom - 0.8.4 + 0.8.5-SNAPSHOT contrast-finder-documentation diff --git a/engine/api/pom.xml b/engine/api/pom.xml index 797a1982..f3c41c54 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.4 + 0.8.5-SNAPSHOT contrast-finder-api - 0.8.4 + 0.8.5-SNAPSHOT jar api diff --git a/engine/hsv/pom.xml b/engine/hsv/pom.xml index fb02ba6e..6777c630 100644 --- a/engine/hsv/pom.xml +++ b/engine/hsv/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.4 + 0.8.5-SNAPSHOT contrast-finder-hsv - 0.8.4 + 0.8.5-SNAPSHOT jar hsv diff --git a/engine/impl/pom.xml b/engine/impl/pom.xml index 7f702cb0..e8939de2 100644 --- a/engine/impl/pom.xml +++ b/engine/impl/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.4 + 0.8.5-SNAPSHOT contrast-finder-impl - 0.8.4 + 0.8.5-SNAPSHOT jar impl diff --git a/engine/pom.xml b/engine/pom.xml index 0a8c7447..4653b41f 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.8.4 + 0.8.5-SNAPSHOT engine - 0.8.4 + 0.8.5-SNAPSHOT pom contrast-finder-engine diff --git a/engine/utils/pom.xml b/engine/utils/pom.xml index 2d7bbc23..369fdd82 100644 --- a/engine/utils/pom.xml +++ b/engine/utils/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.4 + 0.8.5-SNAPSHOT contrast-finder-utils - 0.8.4 + 0.8.5-SNAPSHOT jar utils diff --git a/pom.xml b/pom.xml index 18469dba..aa6470e1 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.asqatasun contrast-finder pom - 0.8.4 + 0.8.5-SNAPSHOT Contrast-Finder diff --git a/webapp/pom.xml b/webapp/pom.xml index 9c088f7e..9f6cef90 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.8.4 + 0.8.5-SNAPSHOT webapp - 0.8.4 + 0.8.5-SNAPSHOT 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 a752d141..d60d4c7f 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 --%> From ff63060cd3bb45be0a31e65effebc49aa894a178 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 24 Jan 2018 05:18:04 +0100 Subject: [PATCH 02/22] fixed i18n file (korean) --- webapp/src/main/webapp/WEB-INF/template/header.jspf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/WEB-INF/template/header.jspf b/webapp/src/main/webapp/WEB-INF/template/header.jspf index 4a5efc4f..c430bafe 100644 --- a/webapp/src/main/webapp/WEB-INF/template/header.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/header.jspf @@ -77,7 +77,7 @@
  • 한국어
    • -
  • 한국어
    • +
  • 한국어
    •  From 084ac2d27693122ddef3da7f325ae4bdd01a1bc7 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 24 Jan 2018 23:32:58 +0100 Subject: [PATCH 03/22] Fixed #127 Webapp - Added contribute.json file - https://www.contributejson.org/ - https://wiki.mozilla.org/Security/Guidelines/Web_Security#contribute.json --- CHANGELOG.md | 2 +- webapp/src/main/webapp/contribute.json | 35 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 webapp/src/main/webapp/contribute.json diff --git a/CHANGELOG.md b/CHANGELOG.md index b4378806..e0805206 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ none none ### Improvement -none +- [#127 - Webapp: added contribute.json file](https://github.com/Asqatasun/Contrast-Finder/issues/127) ### Refactoring none diff --git a/webapp/src/main/webapp/contribute.json b/webapp/src/main/webapp/contribute.json new file mode 100644 index 00000000..08446de3 --- /dev/null +++ b/webapp/src/main/webapp/contribute.json @@ -0,0 +1,35 @@ +{ + "name": "Contrast Finder", + "description": "Contrast-Finder finds correct color contrasts for web accessibility.", + "repository": { + "license": "AGPL v3", + "type": "git", + "url": "https://github.com/Asqatasun/Contrast-Finder", + "clone": "https://github.com/Asqatasun/Contrast-Finder.git", + "tests": "https://travis-ci.org/Asqatasun/Contrast-Finder" + }, + "bugs": { + "list": "https://github.com/Asqatasun/Contrast-Finder/issues", + "report": "https://github.com/Asqatasun/Contrast-Finder/issues/new" + }, + "participate": { + "docs": "https://github.com/Asqatasun/Contrast-Finder/tree/develop/documentation/en", + "home": "https://contrast-finder.org/" + }, + "urls": { + "prod": "https://app.contrast-finder.org/" + }, + "keywords": [ "a11y", + "accessibility", + "color", + "color contrast", + "contrast", + "wcag", + "java", + "spring", + "web accessibility", + "colour contrast", + "colour" + ] +} + From 44f4a43644c1c2634f58272454447ce193fdc651 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 24 Jan 2018 23:59:20 +0100 Subject: [PATCH 04/22] Fixed #128 Webapp - added "charset=UTF-8" HTTP header for css, js, txt, json and xml files --- CHANGELOG.md | 2 +- webapp/src/main/webapp/WEB-INF/web.xml | 27 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0805206..d95930c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ none none ### Bug -none +- [#128 - Webapp: added "charset=UTF-8" HTTP header for css, js, txt, json and xml files](https://github.com/Asqatasun/Contrast-Finder/issues/128) ### Improvement - [#127 - Webapp: added contribute.json file](https://github.com/Asqatasun/Contrast-Finder/issues/127) diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml index c64a4ad3..e48eb339 100644 --- a/webapp/src/main/webapp/WEB-INF/web.xml +++ b/webapp/src/main/webapp/WEB-INF/web.xml @@ -26,6 +26,33 @@ /* + + + encodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + forceEncoding + true + + + + encodingFilter + *.css + *.js + *.json + *.txt + *.xml + + @@ -88,75 +89,75 @@ form.html - 400 - /access-denied.html + /error/error_4xx.html 401 - /access-denied.html + /error/error_4xx.html 403 - /access-denied.html + /error/error_4xx.html 404 - /access-denied.html + /error/error_4xx.html 405 - /access-denied.html + /error/error_4xx.html 500 - /oups.html + /error/error_5xx.html 501 - /oups.html + /error/error_5xx.html 502 - /oups.html + /error/error_5xx.html 503 - /oups.html + /error/error_5xx.html 504 - /oups.html + /error/error_5xx.html 505 - /oups.html + /error/error_5xx.html 506 - /oups.html + /error/error_5xx.html 507 - /oups.html + /error/error_5xx.html 508 - /oups.html + /error/error_5xx.html 509 - /oups.html + /error/error_5xx.html 510 - /oups.html + /error/error_5xx.html 520 - /oups.html + /error/error_5xx.html - --> \ No newline at end of file diff --git a/webapp/src/main/webapp/error/error_4xx.html b/webapp/src/main/webapp/error/error_4xx.html new file mode 100644 index 00000000..58c69193 --- /dev/null +++ b/webapp/src/main/webapp/error/error_4xx.html @@ -0,0 +1,24 @@ + + + + + Error: not found on this server + + + +

    Not Found

    +

    The requested URL was not found on this server.

    + + diff --git a/webapp/src/main/webapp/error/error_5xx.html b/webapp/src/main/webapp/error/error_5xx.html new file mode 100644 index 00000000..0b39687d --- /dev/null +++ b/webapp/src/main/webapp/error/error_5xx.html @@ -0,0 +1,24 @@ + + + + + Error: the server failed to fulfil this request + + + +

    Server error

    +

    The server failed to fulfil this request.

    + + From d388fde75df1b36c05e24e57bb915d65b6948265 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sat, 27 Jan 2018 04:44:11 +0100 Subject: [PATCH 06/22] fixed #130 - .jsp file, form tag: use "modelAttribute" instead of deprecated "commandName" deprecated FormTag's "commandName" in favor of "modelAttribute" - https://jira.spring.io/browse/SPR-14094 - https://github.com/spring-projects/spring-framework/blob/4.3.x/spring-webmvc/src/main/resources/META-INF/spring-form.tld#L134 --- CHANGELOG.md | 2 +- webapp/src/main/webapp/WEB-INF/pages/form.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b77d85c8..adaf32d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ none none ### Outdated dependencies -none +- [#130 - .jsp file, form tag: use "modelAttribute" instead of deprecated "commandName"](https://github.com/Asqatasun/Contrast-Finder/issues/130) ### Bug - [#128 - Webapp: added "charset=UTF-8" HTTP header for css, js, txt, json and xml files](https://github.com/Asqatasun/Contrast-Finder/issues/128) diff --git a/webapp/src/main/webapp/WEB-INF/pages/form.jsp b/webapp/src/main/webapp/WEB-INF/pages/form.jsp index befa7483..17a82a09 100644 --- a/webapp/src/main/webapp/WEB-INF/pages/form.jsp +++ b/webapp/src/main/webapp/WEB-INF/pages/form.jsp @@ -37,7 +37,7 @@ - + <%-- Foregound --%> From 88f98eeb8468f2ce821d742bea60badc93e734fc Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 28 Jan 2018 10:51:43 +0100 Subject: [PATCH 07/22] Webapp - Added env_debug-info.jsp --- webapp/src/main/webapp/WEB-INF/pages/form.jsp | 8 +------ .../WEB-INF/template/env_debug-info.jspf | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 webapp/src/main/webapp/WEB-INF/template/env_debug-info.jspf diff --git a/webapp/src/main/webapp/WEB-INF/pages/form.jsp b/webapp/src/main/webapp/WEB-INF/pages/form.jsp index 17a82a09..1cb418e3 100644 --- a/webapp/src/main/webapp/WEB-INF/pages/form.jsp +++ b/webapp/src/main/webapp/WEB-INF/pages/form.jsp @@ -21,15 +21,9 @@ <%-- DEBUG contrast-finder.conf --%> -
    - env ${env}
    - defaultAlgorithm ${defaultAlgorithm}
    - cookie.algo ${cookie.algo.value}
    - algo ${algo}
    -
    + <%@include file='/WEB-INF/template/env_debug-info.jspf' %>     - <%-- ===== FORM ========================================================================================= --%>
    diff --git a/webapp/src/main/webapp/WEB-INF/template/env_debug-info.jspf b/webapp/src/main/webapp/WEB-INF/template/env_debug-info.jspf new file mode 100644 index 00000000..2d5bc6e9 --- /dev/null +++ b/webapp/src/main/webapp/WEB-INF/template/env_debug-info.jspf @@ -0,0 +1,21 @@ +<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ page pageEncoding="UTF-8" %> + +<%= System.getProperty("java.version") %> +<%= application.getServerInfo() %> +<%= application.getMajorVersion() %>.<%= application.getMinorVersion() %> +<%=JspFactory.getDefaultFactory().getEngineInfo().getSpecificationVersion() %> +
    +

    + env ${env}
    + defaultAlgorithm ${defaultAlgorithm}
    + cookie.algo ${cookie.algo.value}
    + algo ${algo} +

    +

    + Java ${debugJavaVersion}
    + Tomcat : ${debugTomcatVersion}
    + Servlet specification : ${debugServletVersion}
    + JSP : ${debugJspVersion}
    +

    +
    From 813d7a69c75ccfdfd22118225cfefc948d2e637b Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 28 Jan 2018 14:51:38 +0100 Subject: [PATCH 08/22] Fixed #131 - Changed default docker image: ubuntu-16.04_tomcat-7 instead of ubuntu-14.04_tomcat-7 --- CHANGELOG.md | 4 +++- docker/RELEASE/Dockerfile | 2 +- docker/SNAPSHOT-local/Dockerfile | 2 +- .../test_config-file/01.no.config.file/Dockerfile | 2 +- .../test_config-file/10.default.algo/Dockerfile | 2 +- .../SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile | 2 +- docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index adaf32d6..09901ec0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,9 @@ none none ### Configuration -none +- [#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 none diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile index a6718a90..c59b0530 120000 --- a/docker/RELEASE/Dockerfile +++ b/docker/RELEASE/Dockerfile @@ -1 +1 @@ -ubuntu-14.04_tomcat-7/Dockerfile \ No newline at end of file +ubuntu-16.04_tomcat-7/Dockerfile \ No newline at end of file diff --git a/docker/SNAPSHOT-local/Dockerfile b/docker/SNAPSHOT-local/Dockerfile index 2973c9b9..fb2cd11e 120000 --- a/docker/SNAPSHOT-local/Dockerfile +++ b/docker/SNAPSHOT-local/Dockerfile @@ -1 +1 @@ -distrib/ubuntu-14.04_tomcat-7/Dockerfile \ No newline at end of file +distrib/ubuntu-16.04_tomcat-7/Dockerfile \ No newline at end of file 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 d79b471f..a8d876dd 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 @@ -1,4 +1,4 @@ -FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 # #### usage ###################################################### # 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 9bc04d12..d72e27ce 100644 --- a/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile @@ -1,4 +1,4 @@ -FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 # #### usage ###################################################### # 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 ada5ab0d..ca32d383 100644 --- a/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile @@ -1,4 +1,4 @@ -FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 # #### usage ###################################################### # diff --git a/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile b/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile index d8c4fabe..af7d0c79 100644 --- a/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile @@ -1,4 +1,4 @@ -FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 # #### usage ###################################################### # From 47987fb53ca8130f66c11a230f24ecbd18c183ca Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 28 Jan 2018 15:09:15 +0100 Subject: [PATCH 09/22] Fixed #132 - Added new Docker image: pre-requisites_Alpine_tomcat-9 (FROM tomcat:9-jre8-alpine) --- CHANGELOG.md | 1 + .../distrib/alpine_tomcat-9/Dockerfile | 58 ++++++++++++++ .../pre-requisites_Alpine_tomcat-9/Dockerfile | 77 +++++++++++++++++++ .../pre-requisites_Alpine_tomcat-9/README.md | 1 + 4 files changed, 137 insertions(+) create mode 100644 docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile create mode 100644 docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile create mode 120000 docker/pre-requisites/pre-requisites_Alpine_tomcat-9/README.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 09901ec0..4db62a14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ none - [#129 - Webapp: added custom HTTP error pages instead of Tomcat default pages](https://github.com/Asqatasun/Contrast-Finder/issues/129) ### Improvement +- [#132 - Added new Docker image: pre-requisites_Alpine_tomcat-9)](https://github.com/Asqatasun/Contrast-Finder/issues/132) - [#127 - Webapp: added contribute.json file](https://github.com/Asqatasun/Contrast-Finder/issues/127) ### Refactoring diff --git a/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile b/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile new file mode 100644 index 00000000..c690ede0 --- /dev/null +++ b/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile @@ -0,0 +1,58 @@ +FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-9 + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t asqatasun/contrast-finder:SNAPSHOT_local . +# +# --- Launch a container +# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder:SNAPSHOT_local +# +# --- Playing with this docker image +# docker exec -ti contrast.finder /bin/cat /softwares-version.txt +# docker exec -ti contrast.finder /bin/bash +# docker logs -f contrast.finder +# +# #### FROM ###################################################### +# asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-9 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile +# |-- tomcat:9-jre8-alpine https://github.com/docker-library/tomcat/blob/master/9.0/jre8-alpine/Dockerfile +# |-- openjdk:8-jre-alpine https://github.com/docker-library/openjdk/blob/master/8-jre/alpine/Dockerfile +# |-- alpine:3.7 https://github.com/gliderlabs/docker-alpine/blob/master/versions/library-3.7/x86_64/Dockerfile +################################################################### + + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.5-SNAPSHOT" + +# Add contrast-finder .war +ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root + +# Install contrast-finder +RUN cd /root/contrast-*/install/ && \ + mv -v contrast-*.war contrast-finder.war && \ + mv -v contrast-*.war ${TOMCAT_DIR}webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "" >> ${INFO_FILE} && \ + echo "--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "" >> ${INFO_FILE} && \ + echo "--- Logs -----------" >> ${INFO_FILE} && \ + echo "${TOMCAT_DIR}logs/catalina.*.log" >> ${INFO_FILE} && \ + echo "${LOG_FILE}" >> ${INFO_FILE} && \ + echo "--------------------" >> ${INFO_FILE} && \ + cat ${INFO_FILE} > ${LOG_FILE} && echo "-- Install: Ok" + + +# Health Check of the Docker Container +# ----> see asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-8.5 + + +###### don't work ############################ +# CMD catalina.sh run ; \ +# tail -f -n 200 ${TOMCAT_DIR}logs/catalina.*.log \ +# ${LOG_FILE} +################################################### + + # in "tomcat:9-jre8-alpine" DockerFile + # CMD ["catalina.sh", "run"] diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile b/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile new file mode 100644 index 00000000..af1554ac --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile @@ -0,0 +1,77 @@ +FROM tomcat:9-jre8-alpine + +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.8.5-SNAPSHOT" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder:pre-requisites_Alpine_tomcat-9 . +# +# #### FROM ###################################################### +# tomcat:9-jre8-alpine https://github.com/docker-library/tomcat/blob/master/9.0/jre8-alpine/Dockerfile +# |-- openjdk:8-jre-alpine https://github.com/docker-library/openjdk/blob/master/8-jre/alpine/Dockerfile +# |-- alpine:3.7 https://github.com/gliderlabs/docker-alpine/blob/master/versions/library-3.7/x86_64/Dockerfile +################################################################### + +###### PRE-REQUISITES ########################################################## + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_DIR="/usr/local/tomcat/" \ + LOG_FILE="${LOG_DIR}contrast-finder.log" \ + CONF_FILE="${CONF_DIR}contrast-finder.conf" \ + INFO_FILE="/softwares-version.txt" \ + WWWPORT="8080" +EXPOSE $WWWPORT + +# build +RUN apk add --no-cache curl && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + echo "--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "" >> ${INFO_FILE} && \ + echo "--- Java -----------" >> ${INFO_FILE} && \ + echo ${JAVA_HOME} >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "" >> ${INFO_FILE} && \ + echo "--- Tomcat ---------" >> ${INFO_FILE} && \ + ${TOMCAT_DIR}bin/version.sh >> ${INFO_FILE} && \ + echo "" >> ${INFO_FILE} && \ + echo "--- Contrast-Finder ---" >> ${INFO_FILE} + + + ####################################################################################### + # The command line "java -version" returns the output data + # at the STDERR stream (2 : error messages) rather than STDOUT (1). + # -----> java -version 2> tmp.txt + # + # https://stackoverflow.com/questions/21453774/redirect-java-version-to-file-or-variable + # https://stackoverflow.com/questions/39619087/how-to-write-output-of-java-version-to-a-text-file + ####################################################################################### + + +# Health Check of the Docker Container +HEALTHCHECK --timeout=3s \ + CMD curl --fail http://localhost:8080/contrast-finder/ || exit 1 + ###################################################################### + # doc: https://docs.docker.com/engine/reference/builder/#healthcheck + # options: --interval=DURATION (default: 30s) + # --timeout=DURATION (default: 30s) + # --retries=N (default: 3) + # can be overridden at the command line 'docker run --health-cmd (...)' + ###################################################################### + + +# in "tomcat:9-jre8-alpine" DockerFile +# CMD ["catalina.sh", "run"] diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/README.md b/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/README.md new file mode 120000 index 00000000..8e1029b1 --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/README.md @@ -0,0 +1 @@ +../../RELEASE/README.md \ No newline at end of file From b99ee8ecd89cb474c6c277c6bed1ae04389b0ebb Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 4 Feb 2018 13:14:44 +0100 Subject: [PATCH 10/22] Webapp - Moved asset files (css, js, images) to the public/ directory --- webapp/pom.xml | 4 +- .../Images/logo/favicon/browserconfig.xml | 12 ------ .../{ => WEB-INF/pages}/error/error_4xx.html | 0 .../{ => WEB-INF/pages}/error/error_5xx.html | 0 webapp/src/main/webapp/WEB-INF/pages/form.jsp | 18 ++++----- .../main/webapp/WEB-INF/spring/security.xml | 6 +-- .../main/webapp/WEB-INF/template/head.jspf | 36 +++++++++--------- .../main/webapp/WEB-INF/template/header.jspf | 4 +- webapp/src/main/webapp/WEB-INF/web.xml | 34 ++++++++--------- .../{Css => public/css}/10-bootstrap.min.css | 0 .../css}/10-bootstrap_src/bootstrap-theme.css | 0 .../10-bootstrap_src/bootstrap-theme.min.css | 0 .../css}/10-bootstrap_src/bootstrap.css | 0 .../css}/10-bootstrap_src/bootstrap.min.css | 0 .../css}/20-bootstrap-theme.min.css | 0 .../css}/30-contrast-finder.css | 0 ...32-van11y-accessible-modal-window-aria.css | 0 .../css}/40-accessible-table-sorter.css | 6 +-- .../webapp/{Images => public/images}/asc.png | Bin .../webapp/{Images => public/images}/bg.png | Bin .../images}/creative_common_logo.png | Bin .../webapp/{Images => public/images}/desc.png | Bin .../webapp/{Images => public/images}/good.jpg | Bin .../logo/contrast-finder_logo_1051x1053.png | Bin .../logo/favicon/android-chrome-144x144.png | Bin .../logo/favicon/android-chrome-192x192.png | Bin .../logo/favicon/android-chrome-256x256.png | Bin .../logo/favicon/android-chrome-36x36.png | Bin .../logo/favicon/android-chrome-384x384.png | Bin .../logo/favicon/android-chrome-48x48.png | Bin .../logo/favicon/android-chrome-512x512.png | Bin .../logo/favicon/android-chrome-72x72.png | Bin .../logo/favicon/android-chrome-96x96.png | Bin .../apple-touch-icon-114x114-precomposed.png | Bin .../logo/favicon/apple-touch-icon-114x114.png | Bin .../apple-touch-icon-120x120-precomposed.png | Bin .../logo/favicon/apple-touch-icon-120x120.png | Bin .../apple-touch-icon-144x144-precomposed.png | Bin .../logo/favicon/apple-touch-icon-144x144.png | Bin .../apple-touch-icon-152x152-precomposed.png | Bin .../logo/favicon/apple-touch-icon-152x152.png | Bin .../apple-touch-icon-180x180-precomposed.png | Bin .../logo/favicon/apple-touch-icon-180x180.png | Bin .../apple-touch-icon-57x57-precomposed.png | Bin .../logo/favicon/apple-touch-icon-57x57.png | Bin .../apple-touch-icon-60x60-precomposed.png | Bin .../logo/favicon/apple-touch-icon-60x60.png | Bin .../apple-touch-icon-72x72-precomposed.png | Bin .../logo/favicon/apple-touch-icon-72x72.png | Bin .../apple-touch-icon-76x76-precomposed.png | Bin .../logo/favicon/apple-touch-icon-76x76.png | Bin .../favicon/apple-touch-icon-precomposed.png | Bin .../images}/logo/favicon/apple-touch-icon.png | Bin .../images/logo/favicon/browserconfig.xml | 12 ++++++ .../images}/logo/favicon/favicon-16x16.png | Bin .../images}/logo/favicon/favicon-194x194.png | Bin .../images}/logo/favicon/favicon-32x32.png | Bin .../images}/logo/favicon/favicon.ico | Bin .../images}/logo/favicon/manifest.webmanifest | 18 ++++----- .../images}/logo/favicon/mstile-144x144.png | Bin .../images}/logo/favicon/mstile-150x150.png | Bin .../images}/logo/favicon/mstile-310x150.png | Bin .../images}/logo/favicon/mstile-310x310.png | Bin .../images}/logo/favicon/mstile-70x70.png | Bin .../logo/favicon/safari-pinned-tab.svg | 0 .../webapp/{Js => public/js}/10-jquery.min.js | 0 .../js}/20-jquery.tablesorter.min.js | 0 .../webapp/{Js => public/js}/25-accessible.js | 0 .../{Js => public/js}/30-bootstrap.min.js | 0 .../32-van11y-accessible-modal-window-aria.js | 0 .../main/webapp/{Js => public/js}/35-affix.js | 0 .../{Js => public/js}/36-sample.color.js | 0 72 files changed, 75 insertions(+), 75 deletions(-) delete mode 100644 webapp/src/main/webapp/Images/logo/favicon/browserconfig.xml rename webapp/src/main/webapp/{ => WEB-INF/pages}/error/error_4xx.html (100%) rename webapp/src/main/webapp/{ => WEB-INF/pages}/error/error_5xx.html (100%) rename webapp/src/main/webapp/{Css => public/css}/10-bootstrap.min.css (100%) rename webapp/src/main/webapp/{Css => public/css}/10-bootstrap_src/bootstrap-theme.css (100%) rename webapp/src/main/webapp/{Css => public/css}/10-bootstrap_src/bootstrap-theme.min.css (100%) rename webapp/src/main/webapp/{Css => public/css}/10-bootstrap_src/bootstrap.css (100%) rename webapp/src/main/webapp/{Css => public/css}/10-bootstrap_src/bootstrap.min.css (100%) rename webapp/src/main/webapp/{Css => public/css}/20-bootstrap-theme.min.css (100%) rename webapp/src/main/webapp/{Css => public/css}/30-contrast-finder.css (100%) rename webapp/src/main/webapp/{Css => public/css}/32-van11y-accessible-modal-window-aria.css (100%) rename webapp/src/main/webapp/{Css => public/css}/40-accessible-table-sorter.css (90%) rename webapp/src/main/webapp/{Images => public/images}/asc.png (100%) rename webapp/src/main/webapp/{Images => public/images}/bg.png (100%) rename webapp/src/main/webapp/{Images => public/images}/creative_common_logo.png (100%) rename webapp/src/main/webapp/{Images => public/images}/desc.png (100%) rename webapp/src/main/webapp/{Images => public/images}/good.jpg (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/contrast-finder_logo_1051x1053.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/android-chrome-144x144.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/android-chrome-192x192.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/android-chrome-256x256.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/android-chrome-36x36.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/android-chrome-384x384.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/android-chrome-48x48.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/android-chrome-512x512.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/android-chrome-72x72.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/android-chrome-96x96.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-114x114-precomposed.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-114x114.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-120x120-precomposed.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-120x120.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-144x144-precomposed.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-144x144.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-152x152-precomposed.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-152x152.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-180x180-precomposed.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-180x180.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-57x57-precomposed.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-57x57.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-60x60-precomposed.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-60x60.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-72x72-precomposed.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-72x72.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-76x76-precomposed.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-76x76.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon-precomposed.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/apple-touch-icon.png (100%) create mode 100644 webapp/src/main/webapp/public/images/logo/favicon/browserconfig.xml rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/favicon-16x16.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/favicon-194x194.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/favicon-32x32.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/favicon.ico (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/manifest.webmanifest (54%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/mstile-144x144.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/mstile-150x150.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/mstile-310x150.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/mstile-310x310.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/mstile-70x70.png (100%) rename webapp/src/main/webapp/{Images => public/images}/logo/favicon/safari-pinned-tab.svg (100%) rename webapp/src/main/webapp/{Js => public/js}/10-jquery.min.js (100%) rename webapp/src/main/webapp/{Js => public/js}/20-jquery.tablesorter.min.js (100%) rename webapp/src/main/webapp/{Js => public/js}/25-accessible.js (100%) rename webapp/src/main/webapp/{Js => public/js}/30-bootstrap.min.js (100%) rename webapp/src/main/webapp/{Js => public/js}/32-van11y-accessible-modal-window-aria.js (100%) rename webapp/src/main/webapp/{Js => public/js}/35-affix.js (100%) rename webapp/src/main/webapp/{Js => public/js}/36-sample.color.js (100%) diff --git a/webapp/pom.xml b/webapp/pom.xml index 9f6cef90..73107fe1 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -136,14 +136,14 @@ true - ${project.build.directory}/${project.build.finalName}/Js/_contrast-finder_${project.version}.all.min.js + ${project.build.directory}/${project.build.finalName}/public/js/_contrast-finder_${project.version}.all.min.js **/*min.js true - ${project.build.directory}/${project.build.finalName}/Css/_contrast-finder_${project.version}.all.min.css + ${project.build.directory}/${project.build.finalName}/public/css/_contrast-finder_${project.version}.all.min.css **/*min.css diff --git a/webapp/src/main/webapp/Images/logo/favicon/browserconfig.xml b/webapp/src/main/webapp/Images/logo/favicon/browserconfig.xml deleted file mode 100644 index 0dc493e6..00000000 --- a/webapp/src/main/webapp/Images/logo/favicon/browserconfig.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - #2d89ef - - - diff --git a/webapp/src/main/webapp/error/error_4xx.html b/webapp/src/main/webapp/WEB-INF/pages/error/error_4xx.html similarity index 100% rename from webapp/src/main/webapp/error/error_4xx.html rename to webapp/src/main/webapp/WEB-INF/pages/error/error_4xx.html diff --git a/webapp/src/main/webapp/error/error_5xx.html b/webapp/src/main/webapp/WEB-INF/pages/error/error_5xx.html similarity index 100% rename from webapp/src/main/webapp/error/error_5xx.html rename to webapp/src/main/webapp/WEB-INF/pages/error/error_5xx.html diff --git a/webapp/src/main/webapp/WEB-INF/pages/form.jsp b/webapp/src/main/webapp/WEB-INF/pages/form.jsp index 1cb418e3..1fbf8f10 100644 --- a/webapp/src/main/webapp/WEB-INF/pages/form.jsp +++ b/webapp/src/main/webapp/WEB-INF/pages/form.jsp @@ -216,13 +216,13 @@
    - " alt="Correct contrast"/> + " alt="Correct contrast"/>
    @@ -437,15 +437,15 @@ <%@include file='/WEB-INF/template/footer.jspf' %> - - diff --git a/webapp/src/main/webapp/WEB-INF/spring/security.xml b/webapp/src/main/webapp/WEB-INF/spring/security.xml index 18b7f5b9..bb70e0e8 100644 --- a/webapp/src/main/webapp/WEB-INF/spring/security.xml +++ b/webapp/src/main/webapp/WEB-INF/spring/security.xml @@ -51,9 +51,9 @@ ___________________________________________________ // works with HTTP headers (X-FRAME, ...) but added no-cache HTTP headers - // Css/Js/image : not added HTTP headers / 304 for repeat view - - + // CSS, JS and Image : not added HTTP headers / 304 for repeat view + + diff --git a/webapp/src/main/webapp/WEB-INF/template/head.jspf b/webapp/src/main/webapp/WEB-INF/template/head.jspf index 7d5c1dcd..b5ff115d 100644 --- a/webapp/src/main/webapp/WEB-INF/template/head.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/head.jspf @@ -2,26 +2,26 @@ ${titleTag} - "> + "> - - " sizes="180x180" > - " sizes="32x32"> - " sizes="194x194"> - " sizes="192x192"> - " sizes="16x16"> - "> - "> - - " > - "> - "> + " sizes="180x180" > + " sizes="32x32"> + " sizes="194x194"> + " sizes="192x192"> + " sizes="16x16"> + "> + "> + + " > + "> + "> @@ -44,7 +44,7 @@ " /> " /> - + @@ -54,5 +54,5 @@ " /> " /> - + \ No newline at end of file diff --git a/webapp/src/main/webapp/WEB-INF/template/header.jspf b/webapp/src/main/webapp/WEB-INF/template/header.jspf index c430bafe..ba932afc 100644 --- a/webapp/src/main/webapp/WEB-INF/template/header.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/header.jspf @@ -86,12 +86,12 @@
    - " alt="Correct contrast"/> + " alt="Correct contrast"/>
    @@ -437,15 +437,15 @@ <%@include file='/WEB-INF/template/footer.jspf' %> - - diff --git a/webapp/src/main/webapp/WEB-INF/template/head.jspf b/webapp/src/main/webapp/WEB-INF/template/head.jspf index 80fa05e2..69fb0d74 100644 --- a/webapp/src/main/webapp/WEB-INF/template/head.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/head.jspf @@ -2,26 +2,26 @@ ${titleTag} - "> + "> - - " sizes="180x180" > - " sizes="32x32"> - " sizes="194x194"> - " sizes="192x192"> - " sizes="16x16"> - "> - "> - - " > - "> - "> + " sizes="180x180" > + " sizes="32x32"> + " sizes="194x194"> + " sizes="192x192"> + " sizes="16x16"> + "> + "> + + " > + "> + "> @@ -47,7 +47,7 @@ " /> " /> - + @@ -57,5 +57,5 @@ " /> " /> - + \ No newline at end of file diff --git a/webapp/src/main/webapp/WEB-INF/template/header.jspf b/webapp/src/main/webapp/WEB-INF/template/header.jspf index ba932afc..56bb5ce5 100644 --- a/webapp/src/main/webapp/WEB-INF/template/header.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/header.jspf @@ -86,12 +86,12 @@