diff --git a/.travis.yml b/.travis.yml index c16d2f86..7ba084bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,2 @@ language: java -jdk: - - openjdk7 +jdk: openjdk8 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a546762..f5eb1bbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,41 @@ # CHANGELOG +Contrast-Finder 0.8.4, 2018-01-24 +--------------------------------- + +Upgrade-o-meter: just replace the .war file and restart Tomcat + +### Outdated dependencies +- [#108 - Upgraded SpringFramework (4.3.14 instead of 4.3.13)](https://github.com/Asqatasun/Contrast-Finder/issues/108) +- [#113 - Upgraded markdown-page-generator-plugin (2.0.1 instead of 2.0.0)](https://github.com/Asqatasun/Contrast-Finder/issues/113) +- [#119 - Upgraded maven-javadoc-plugin (3.0.0 instead of 3.0.0-M1)](https://github.com/Asqatasun/Contrast-Finder/issues/119) +- [#120 - Upgraded jacoco-maven-plugin (0.8.0 instead of 0.7.9)](https://github.com/Asqatasun/Contrast-Finder/issues/120) +- [#121 - Upgraded maven-checkstyle-plugin (3.0.0 instead of 2.17)](https://github.com/Asqatasun/Contrast-Finder/issues/121) +- [#123 - Upgraded native2ascii-maven-plugin (2.0.0 instead of 1.0-beta-1)](https://github.com/Asqatasun/Contrast-Finder/issues/123) +- [#118 - Upgraded jdeb maven plugin (1.6 instead of 1.5)](https://github.com/Asqatasun/Contrast-Finder/issues/118) + - [#125 - Contrast-Finder build need openjdk 8 (prerequisite jdeb)](https://github.com/Asqatasun/Contrast-Finder/issues/125) + +### Improvement +- [#110 - Added new docker image: ubuntu 16.04 (tomcat-7)](https://github.com/Asqatasun/Contrast-Finder/issues/110) +- [#112 - Added new docker image: alpine (tomcat-7)](https://github.com/Asqatasun/Contrast-Finder/issues/112) +- [#116 - Added new docker image: alpine (tomcat-8.5)](https://github.com/Asqatasun/Contrast-Finder/issues/116) +- [#117 - Added some new pre-requisites_* Docker images (debian 9, ubuntu 18.04)](https://github.com/Asqatasun/Contrast-Finder/issues/117) +- [#109 - Docker/pre-requisites/ - Added /softwares-version.txt](https://github.com/Asqatasun/Contrast-Finder/issues/109) +- [#124 - Create 2 Debian packages (.deb) at the maven build for tomcat7 and tomcat8](https://github.com/Asqatasun/Contrast-Finder/issues/124) + +### Refactoring +- [#114 - Updated webapp/pom.xml - new name for .war, .tar.gz and .deb](https://github.com/Asqatasun/Contrast-Finder/issues/114) +- [#115 - Updated prerequisites : libspring-instrument-java is not needed](https://github.com/Asqatasun/Contrast-Finder/issues/115) + +### Documentation +- [#114 - Updated documentation - new name for .war, .tar.gz and .deb](https://github.com/Asqatasun/Contrast-Finder/issues/114) +- [#115 - Updated prerequisites documentation](https://github.com/Asqatasun/Contrast-Finder/issues/115) + +### Task +- [#106 - Added unit tests coverage report (cobertura-maven-plugin)](https://github.com/Asqatasun/Contrast-Finder/issues/106) +- /!\ see #125 - [#111 -.travis.yml - Added openjdk8 in addition to openjdk7](https://github.com/Asqatasun/Contrast-Finder/issues/111) + + Contrast-Finder 0.8.3, 2017-11-28 --------------------------------- @@ -18,7 +54,6 @@ Upgrade-o-meter: just replace the .war file and restart Tomcat - [#107 - Added missing unit tests for engine/utils/*](https://github.com/Asqatasun/Contrast-Finder/issues/107) - Contrast-Finder 0.8.2, 2017-10-28 --------------------------------- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0b10c134..4c0daa67 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -38,7 +38,7 @@ thus only contains tagged releases. git clone https://github.com/Asqatasun/Contrast-Finder cd Contrast-finder git checkout develop -docker/build_and_run-with-docker.sh -l -s ${PWD} -d docker/SNAPSHOT-local_from-Ubuntu +docker/build_and_run-with-docker.sh -l -s ${PWD} -d docker/SNAPSHOT-local ``` ## Sources of inspiration for CONTRIBUTING.md diff --git a/README.md b/README.md index 740912b3..14bec2e3 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ * Tool to provide color combination for a good (accessible, WCAG-compliant) contrast. * This helps you in satisfying web accessibility (a11y) tests on contrasts: - * [WCAG Success Criteria 1.4.3](http://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast) - * [WCAG Success Criteria 1.4.6](http://www.w3.org/TR/WCAG20/#visual-audio-contrast7) + * [WCAG Success Criteria 1.4.3](https://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast) + * [WCAG Success Criteria 1.4.6](https://www.w3.org/TR/WCAG20/#visual-audio-contrast7) * [RGAA test 3.3 (in french)](http://references.modernisation.gouv.fr/rgaa-accessibilite/criteres.html#crit-3-3) * [RGAA test 3.4 (in french)](http://references.modernisation.gouv.fr/rgaa-accessibilite/criteres.html#crit-3-4) diff --git a/docker/README.md b/docker/README.md index 1db40288..75157b95 100644 --- a/docker/README.md +++ b/docker/README.md @@ -13,7 +13,7 @@ To enjoy it, do: git clone https://github.com/Asqatasun/Contrast-Finder cd Contrast-finder git checkout develop -docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local_from-Ubuntu +docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local ``` In your browser, go to `http://127.0.0.1:8087/contrast-finder/` diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile deleted file mode 100644 index fdfa1011..00000000 --- a/docker/RELEASE/Dockerfile +++ /dev/null @@ -1,65 +0,0 @@ -FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu -LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ - org.label-schema.name = "Contrast-Finder - WebApp" \ - org.label-schema.version = "0.8.3" \ - 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" \ - org.label-schema.usage = "https://github.com/Asqatasun/Contrast-Finder/tree/develop/documentation/" \ - org.label-schema.description = "Contrast-Finder finds correct color contrasts for web accessibility." - # ----> documentation http://label-schema.org/ - -# #### usage ###################################################### -# -# --- Building this docker image -# docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.3 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.3/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.3/contrast-finder_0.8.3.i386.tar.gz . -# -# --- Launch a container -# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder -# -# --- Playing with this docker image -# docker exec -ti contrast.finder /bin/bash -# docker logs -f contrast.finder -# -# #### source code ############################################### -# https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}/contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz -# could be overridden with --build-arg CONTRAST_FINDER_RELEASE= -# could be overridden with --build-arg SRC_URL_PREFIX= -# could be overridden with --build-arg SRC_URL= -# -# #### FROM ###################################################### -# asqatasun/contrast-finder:pre-requisites_from-Ubuntu https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile -# |-- ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist/trusty/Dockerfile -################################################################### - -# build variables -ARG CONTRAST_FINDER_RELEASE="0.8.3" -ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" -ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz" - -# Install contrast-finder -RUN cd /root/ && \ - wget ${SRC_URL} && \ - tar -xzvf contrast-*.tar.gz && \ - cd /root/contrast-*/install/ && \ - mv -v contrast-*.war contrast-finder.war && \ - mv -v contrast-*.war /var/lib/tomcat7/webapps && \ - touch /var/log/contrast-finder/contrast-finder.log && \ - rm -rf /root/contrast-* && echo "-- Install: Ok" - -# environment variables -ENV CONTRAST_FINDER=${CONTRAST_FINDER_RELEASE} -ENV SRC=${SRC_URL} - -# Health Check of the Docker Container -# ----> see asqatasun/contrast-finder:pre-requisites_from-Ubuntu - -CMD service tomcat7 start ; \ - tail -f /var/log/tomcat7/catalina.out \ - /var/log/contrast-finder/contrast-finder.log - - - diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile new file mode 120000 index 00000000..a6718a90 --- /dev/null +++ b/docker/RELEASE/Dockerfile @@ -0,0 +1 @@ +ubuntu-14.04_tomcat-7/Dockerfile \ No newline at end of file diff --git a/docker/RELEASE/README.md b/docker/RELEASE/README.md index f53ab303..fdda931e 100644 --- a/docker/RELEASE/README.md +++ b/docker/RELEASE/README.md @@ -6,14 +6,17 @@ Tool to provide color combination for a good (accessible, WCAG-compliant) contra ## Supported tags Supported tags and respective `Dockerfile` links : -* [pre-requisites_from-Ubuntu](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile) -* [v0.8.3, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/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) +### Pre-requisites +* [pre-requisites_Ubuntu-14.04_tomcat-7](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile) +* [pre-requisites_Ubuntu-16.04_tomcat-7](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile) +* [pre-requisites_Alpine_tomcat-7](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile) +* [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) +* [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 `docker pull asqatasun/contrast-finder` diff --git a/docker/RELEASE/alpine_tomcat-7/Dockerfile b/docker/RELEASE/alpine_tomcat-7/Dockerfile new file mode 100644 index 00000000..46cc8468 --- /dev/null +++ b/docker/RELEASE/alpine_tomcat-7/Dockerfile @@ -0,0 +1,82 @@ +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.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" \ + org.label-schema.usage = "https://github.com/Asqatasun/Contrast-Finder/tree/develop/documentation/" \ + org.label-schema.description = "Contrast-Finder finds correct color contrasts for web accessibility." + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- 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 . +# +# --- Launch a container +# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder +# +# --- 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 +# +# #### source code ############################################### +# https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz +# could be overridden with --build-arg CONTRAST_FINDER_RELEASE= +# could be overridden with --build-arg SRC_URL_PREFIX= +# could be overridden with --build-arg SRC_URL= +# +# #### FROM ###################################################### +# asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile +# |-- tomcat:7-jre7-alpine https://github.com/docker-library/tomcat/blob/master/7/jre7-alpine/Dockerfile +# |-- openjdk:7-jre-alpine https://github.com/docker-library/openjdk/blob/master/7-jre/alpine/Dockerfile +# |-- alpine:3.7 https://github.com/gliderlabs/docker-alpine/blob/master/versions/library-3.7/x86_64/Dockerfile +################################################################### + +# build variables +ARG CONTRAST_FINDER_RELEASE="0.8.4" +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" + +# Install contrast-finder +RUN cd /root/ && \ + wget ${SRC_URL} && \ + tar -xzvf contrast-*.tar.gz && \ + 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" + +# environment variables +ENV CONTRAST_FINDER=${CONTRAST_FINDER_RELEASE} +ENV SRC=${SRC_URL} + + +# Health Check of the Docker Container +# ----> see asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7 + + +###### don't work ############################ +# CMD catalina.sh run ; \ +# tail -f -n 200 ${TOMCAT_DIR}logs/catalina.*.log \ +# ${LOG_FILE} +################################################### + + # in "tomcat:7-jre7-alpine" DockerFile + # CMD ["catalina.sh", "run"] + diff --git a/docker/RELEASE/alpine_tomcat-7/README.md b/docker/RELEASE/alpine_tomcat-7/README.md new file mode 120000 index 00000000..32d46ee8 --- /dev/null +++ b/docker/RELEASE/alpine_tomcat-7/README.md @@ -0,0 +1 @@ +../README.md \ No newline at end of file diff --git a/docker/RELEASE/alpine_tomcat-8.5/Dockerfile b/docker/RELEASE/alpine_tomcat-8.5/Dockerfile new file mode 100644 index 00000000..b0264631 --- /dev/null +++ b/docker/RELEASE/alpine_tomcat-8.5/Dockerfile @@ -0,0 +1,82 @@ +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.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" \ + org.label-schema.usage = "https://github.com/Asqatasun/Contrast-Finder/tree/develop/documentation/" \ + org.label-schema.description = "Contrast-Finder finds correct color contrasts for web accessibility." + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- 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 . +# +# --- Launch a container +# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder +# +# --- 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 +# +# #### source code ############################################### +# https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz +# could be overridden with --build-arg CONTRAST_FINDER_RELEASE= +# could be overridden with --build-arg SRC_URL_PREFIX= +# could be overridden with --build-arg SRC_URL= +# +# #### FROM ###################################################### +# asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-8.5 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile +# |-- tomcat:8.5-jre8-alpine https://github.com/docker-library/tomcat/blob/master/8.5/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 +################################################################### + +# build variables +ARG CONTRAST_FINDER_RELEASE="0.8.4" +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" + +# Install contrast-finder +RUN cd /root/ && \ + wget ${SRC_URL} && \ + tar -xzvf contrast-*.tar.gz && \ + 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" + +# environment variables +ENV CONTRAST_FINDER=${CONTRAST_FINDER_RELEASE} +ENV SRC=${SRC_URL} + + +# 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:8.5-jre8-alpine" DockerFile + # CMD ["catalina.sh", "run"] + diff --git a/docker/RELEASE/alpine_tomcat-8.5/README.md b/docker/RELEASE/alpine_tomcat-8.5/README.md new file mode 120000 index 00000000..32d46ee8 --- /dev/null +++ b/docker/RELEASE/alpine_tomcat-8.5/README.md @@ -0,0 +1 @@ +../README.md \ No newline at end of file diff --git a/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile b/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile new file mode 100644 index 00000000..9ad14c24 --- /dev/null +++ b/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile @@ -0,0 +1,70 @@ +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.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" \ + org.label-schema.usage = "https://github.com/Asqatasun/Contrast-Finder/tree/develop/documentation/" \ + org.label-schema.description = "Contrast-Finder finds correct color contrasts for web accessibility." + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- 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 . +# +# --- Launch a container +# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder +# +# --- 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 +# +# #### source code ############################################### +# https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz +# could be overridden with --build-arg CONTRAST_FINDER_RELEASE= +# could be overridden with --build-arg SRC_URL_PREFIX= +# could be overridden with --build-arg SRC_URL= +# +# #### FROM ###################################################### +# asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile +# |-- ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/trusty/Dockerfile +################################################################### + +# build variables +ARG CONTRAST_FINDER_RELEASE="0.8.4" +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" + +# Install contrast-finder +RUN cd /root/ && \ + wget ${SRC_URL} && \ + tar -xzvf contrast-*.tar.gz && \ + cd /root/contrast-*/install/ && \ + mv -v contrast-*.war contrast-finder.war && \ + mv -v contrast-*.war /var/lib/tomcat7/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- Logs -----------" >> ${INFO_FILE} && \ + echo "${TOMCAT_LOG}" >> ${INFO_FILE} && \ + echo "${LOG_FILE}" >> ${INFO_FILE} && \ + echo "--------------------" >> ${INFO_FILE} && \ + cat ${INFO_FILE} > ${LOG_FILE} && echo "-- Install: Ok" + +# environment variables +ENV CONTRAST_FINDER=${CONTRAST_FINDER_RELEASE} +ENV SRC=${SRC_URL} + +# Health Check of the Docker Container +# ----> see asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 + +CMD service tomcat7 start ; \ + tail -f -n 50 ${TOMCAT_LOG} \ + ${LOG_FILE} diff --git a/docker/RELEASE/ubuntu-14.04_tomcat-7/README.md b/docker/RELEASE/ubuntu-14.04_tomcat-7/README.md new file mode 120000 index 00000000..32d46ee8 --- /dev/null +++ b/docker/RELEASE/ubuntu-14.04_tomcat-7/README.md @@ -0,0 +1 @@ +../README.md \ No newline at end of file diff --git a/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile b/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile new file mode 100644 index 00000000..a31abc8d --- /dev/null +++ b/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile @@ -0,0 +1,71 @@ +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.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" \ + org.label-schema.usage = "https://github.com/Asqatasun/Contrast-Finder/tree/develop/documentation/" \ + org.label-schema.description = "Contrast-Finder finds correct color contrasts for web accessibility." + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- 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 . +# +# --- Launch a container +# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder +# +# --- 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 +# +# #### source code ############################################### +# https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz +# could be overridden with --build-arg CONTRAST_FINDER_RELEASE= +# could be overridden with --build-arg SRC_URL_PREFIX= +# could be overridden with --build-arg SRC_URL= +# +# #### FROM ###################################################### +# asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile +# |-- ubuntu:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +################################################################### + +# build variables +ARG CONTRAST_FINDER_RELEASE="0.8.4" +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" + +# Install contrast-finder +RUN cd /root/ && \ + wget ${SRC_URL} && \ + tar -xzvf contrast-*.tar.gz && \ + cd /root/contrast-*/install/ && \ + mv -v contrast-*.war contrast-finder.war && \ + mv -v contrast-*.war /var/lib/tomcat7/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- Logs -----------" >> ${INFO_FILE} && \ + echo "${TOMCAT_LOG}" >> ${INFO_FILE} && \ + echo "${LOG_FILE}" >> ${INFO_FILE} && \ + echo "--------------------" >> ${INFO_FILE} && \ + cat ${INFO_FILE} > ${LOG_FILE} && echo "-- Install: Ok" + +# environment variables +ENV CONTRAST_FINDER=${CONTRAST_FINDER_RELEASE} +ENV SRC=${SRC_URL} + +# Health Check of the Docker Container +# ----> see asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 + +CMD service tomcat7 start ; \ + tail -f -n 50 ${TOMCAT_LOG} \ + ${LOG_FILE} + diff --git a/docker/RELEASE/ubuntu-16.04_tomcat-7/README.md b/docker/RELEASE/ubuntu-16.04_tomcat-7/README.md new file mode 120000 index 00000000..32d46ee8 --- /dev/null +++ b/docker/RELEASE/ubuntu-16.04_tomcat-7/README.md @@ -0,0 +1 @@ +../README.md \ No newline at end of file diff --git a/docker/SNAPSHOT-local/Dockerfile b/docker/SNAPSHOT-local/Dockerfile new file mode 120000 index 00000000..2973c9b9 --- /dev/null +++ b/docker/SNAPSHOT-local/Dockerfile @@ -0,0 +1 @@ +distrib/ubuntu-14.04_tomcat-7/Dockerfile \ No newline at end of file diff --git a/docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile b/docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile new file mode 100644 index 00000000..16f95129 --- /dev/null +++ b/docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile @@ -0,0 +1,57 @@ +FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7 + +# #### 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-7 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile +# |-- tomcat:7-jre7-alpine https://github.com/docker-library/tomcat/blob/master/7/jre7-alpine/Dockerfile +# |-- openjdk:7-jre-alpine https://github.com/docker-library/openjdk/blob/master/7-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.4" + +# 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-7 + + +###### don't work ############################ +# CMD catalina.sh run ; \ +# tail -f -n 200 ${TOMCAT_DIR}logs/catalina.*.log \ +# ${LOG_FILE} +################################################### + + # in "tomcat:7-jre7-alpine" DockerFile + # CMD ["catalina.sh", "run"] diff --git a/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile b/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile new file mode 100644 index 00000000..e8fd935e --- /dev/null +++ b/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile @@ -0,0 +1,58 @@ +FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-8.5 + +# #### 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-8.5 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile +# |-- tomcat:8.5-jre8-alpine https://github.com/docker-library/tomcat/blob/master/8.5/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.4" + +# 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:8.5-jre8-alpine" DockerFile + # CMD ["catalina.sh", "run"] diff --git a/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile b/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile new file mode 100644 index 00000000..f3dd2c00 --- /dev/null +++ b/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile @@ -0,0 +1,47 @@ +FROM asqatasun/contrast-finder:pre-requisites_Debian-9_tomcat-8.5 + +# #### 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_Debian-9_tomcat-8.5 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile +# |-- debian:9 https://github.com/debuerreotype/docker-debian-artifacts/blob/dist-amd64/stretch/Dockerfile +################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat8/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_Debian-9_tomcat-8.5 + +CMD service tomcat8 start ; \ + 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 new file mode 100644 index 00000000..6145b4d4 --- /dev/null +++ b/docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile @@ -0,0 +1,51 @@ +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 + +# #### 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_Ubuntu-14.04_tomcat-7 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile +# |-- ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/trusty/Dockerfile +################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat7/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_Ubuntu-14.04_tomcat-7 + +CMD service tomcat7 start ; \ + tail -f -n 50 ${TOMCAT_LOG} \ + ${LOG_FILE} + + + + diff --git a/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile new file mode 100644 index 00000000..95394ae0 --- /dev/null +++ b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile @@ -0,0 +1,51 @@ +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 + +# #### 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_Ubuntu-16.04_tomcat-7 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile +# |-- ubuntu:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat7/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_Ubuntu-16.04_tomcat-7 + +CMD service tomcat7 start ; \ + tail -f -n 50 ${TOMCAT_LOG} \ + ${LOG_FILE} + + + + 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 new file mode 100644 index 00000000..65c56c49 --- /dev/null +++ b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile @@ -0,0 +1,47 @@ +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_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_Ubuntu-16.04_tomcat-8.0 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile +# |-- ubuntu:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat8/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_Ubuntu-16.04_tomcat-8.0 + +CMD service tomcat8 start ; \ + tail -f -n 50 ${TOMCAT_LOG} \ + ${LOG_FILE} 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 new file mode 100644 index 00000000..45ff4ca0 --- /dev/null +++ b/docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile @@ -0,0 +1,48 @@ +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 + +# #### 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_Ubuntu-18.04_tomcat-8.5 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile +# |-- ubuntu:18.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/bionic/Dockerfile + +################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat8/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_Ubuntu-18.04_tomcat-8.5 + +CMD service tomcat8 start ; \ + tail -f -n 50 ${TOMCAT_LOG} \ + ${LOG_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 new file mode 100644 index 00000000..56026f58 --- /dev/null +++ b/docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile @@ -0,0 +1,51 @@ +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 + +# #### 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_Ubuntu-14.04_tomcat-7 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile +# |-- ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/trusty/Dockerfile +################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat7/webapps && \ + rm -rf /root/contrast-* && \ +rm -v ${CONF_FILE} && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ +echo "no file" >> ${INFO_FILE} && \ + echo "\n--- 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_Ubuntu-14.04_tomcat-7 + +CMD service tomcat7 start ; \ + tail -f -n 50 ${TOMCAT_LOG} \ + ${LOG_FILE} + + + diff --git a/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile b/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile new file mode 100644 index 00000000..78d1fe79 --- /dev/null +++ b/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile @@ -0,0 +1,51 @@ +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 + +# #### 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_Ubuntu-14.04_tomcat-7 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile +# |-- ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/trusty/Dockerfile +################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONF_DEFAULT_ALGO="Rgb" + # ENV CONF_DEFAULT_ALGO="Rgb" + # ENV CONF_DEFAULT_ALGO="HSV" + # ENV CONF_DEFAULT_ALGO="Bad_Algo" + +# 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/tomcat7/webapps && \ + rm -rf /root/contrast-* && \ +echo "default_algorithm=${CONF_DEFAULT_ALGO}" >> ${CONF_FILE} && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_Ubuntu-14.04_tomcat-7 + +CMD service tomcat7 start ; \ + tail -f -n 50 ${TOMCAT_LOG} \ + ${LOG_FILE} diff --git a/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile b/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile new file mode 100644 index 00000000..b455538b --- /dev/null +++ b/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile @@ -0,0 +1,48 @@ +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 + +# #### 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_Ubuntu-14.04_tomcat-7 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile +# |-- ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/trusty/Dockerfile +################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV CONF_ENV="debug" + +# 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/tomcat7/webapps && \ + rm -rf /root/contrast-* && \ +echo "env=${CONF_ENV}" >> ${CONF_FILE} && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_Ubuntu-14.04_tomcat-7 + +CMD service tomcat7 start ; \ + tail -f -n 50 ${TOMCAT_LOG} \ + ${LOG_FILE} diff --git a/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile b/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile new file mode 100644 index 00000000..480b36ac --- /dev/null +++ b/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile @@ -0,0 +1,53 @@ +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 + +# #### 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_Ubuntu-14.04_tomcat-7 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile +# |-- ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/trusty/Dockerfile +################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" +ENV PIWIK_KEY="9" +ENV PIWIK_URL="http://localhost/piwik/" + +# 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/tomcat7/webapps && \ + rm -rf /root/contrast-* && \ +echo "piwik_analytics_key=${PIWIK_KEY}" >> ${CONF_FILE} && \ +echo "piwik_analytics_server=${PIWIK_URL}" >> ${CONF_FILE} && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_Ubuntu-14.04_tomcat-7 + +CMD service tomcat7 start ; \ + tail -f -n 50 ${TOMCAT_LOG} \ + ${LOG_FILE} + + + diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/README.txt b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/README.txt new file mode 100644 index 00000000..8b07a9b4 --- /dev/null +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/README.txt @@ -0,0 +1,74 @@ + + +----- with libspring-instrument-java --------------------------------------- + + commit 527be04da1385e05940051de27e2c356d9cedc5d + +OK /distrib/debian-8_tomcat-7_legacy-debian +OK /test_tomcat-7-8/Ubuntu_14.04_tomcat7_full +OK /test_tomcat-7-8/Ubuntu_16.04_tomcat7_full +OK /test_tomcat-7-8/Ubuntu_16.04_tomcat8_full +FAIL /test_tomcat-7-8/Ubuntu_18.04_tomcat8_full + +--------------------------------------------------------------------- + +UBUNTU 18.04 Tomcat 8.5 +----------------------------- +docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_18.04_tomcat8_full/ --log-build +docker exec -ti contrast.finder /bin/cat /softwares-version.txt +docker logs --since 24h contrast.finder &> log_UBUNTU-18.04_tomcat-8_withSpringInstrumentClassLoader.log +docker exec -ti contrast.finder /bin/bash + ls -l /usr/share/java/spring3-instrument.jar + ls -l /usr/share/tomcat8/lib/spring3-instrument-tomcat.jar + cat /var/lib/tomcat8/webapps/contrast-finder/META-INF/context.xml + cat /var/lib/tomcat8/webapps/contrast-finder/META-INF/MANIFEST.MF + + ---------------------------------------------------------------------------------- + 18.04 vs 16.04 for libspring-instrument-java + https://packages.ubuntu.com/bionic/all/libspring-instrument-java/filelist + vs https://packages.ubuntu.com/xenial/all/libspring-instrument-java/filelist + ---------------------------------------------------------------------------------- + +UBUNTU 16.04 Tomcat 8.0 +----------------------------- +docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat8_full/ --log-build +docker exec -ti contrast.finder /bin/cat /softwares-version.txt +docker logs --since 24h contrast.finder &> log_UBUNTU-16.04_tomcat-8_withSpringInstrumentClassLoader.log +docker exec -ti contrast.finder /bin/bash + ls -l /usr/share/java/spring3-instrument-tomcat.jar + ls -l /usr/share/tomcat8/lib/spring3-instrument-tomcat.jar + cat /var/lib/tomcat8/webapps/contrast-finder/META-INF/context.xml + cat /var/lib/tomcat8/webapps/contrast-finder/META-INF/MANIFEST.MF + +UBUNTU 16.04 Tomcat 7 +----------------------------- +docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat7_full/ --log-build +docker exec -ti contrast.finder /bin/cat /softwares-version.txt +docker logs --since 24h contrast.finder &> log_UBUNTU-16.04_tomcat-7_withSpringInstrumentClassLoader.log +docker exec -ti contrast.finder /bin/bash + ls -l /usr/share/java/spring3-instrument-tomcat.jar + ls -l /usr/share/tomcat7/lib/spring3-instrument-tomcat.jar + cat /var/lib/tomcat7/webapps/contrast-finder/META-INF/context.xml + cat /var/lib/tomcat7/webapps/contrast-finder/META-INF/MANIFEST.MF + +UBUNTU 14.04 Tomcat 7 +----------------------------- +docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full --log-build +docker exec -ti contrast.finder /bin/cat /softwares-version.txt +docker logs --since 24h contrast.finder &> log_UBUNTU-14.04_withSpringInstrumentClassLoader.log +docker exec -ti contrast.finder /bin/bash + ls -l /usr/share/java/spring3-instrument-tomcat.jar + ls -l /usr/share/tomcat7/lib/spring3-instrument-tomcat.jar + cat /var/lib/tomcat7/webapps/contrast-finder/META-INF/context.xml + cat /var/lib/tomcat7/webapps/contrast-finder/META-INF/MANIFEST.MF + +DEBIAN 8 Tomcat 7 +----------------------------- +docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local/distrib/debian-8_tomcat-7_legacy-debian --log-build +docker exec -ti contrast.finder /bin/cat /softwares-version.txt +docker logs --since 24h contrast.finder &> log_DEBIAN-8_withSpringInstrumentClassLoader.log +docker exec -ti contrast.finder /bin/bash + cat /usr/local/tomcat/webapps/contrast-finder/META-INF/context.xml + cat /usr/local/tomcat/webapps/contrast-finder/META-INF/MANIFEST.MF + ls -l /usr/share/java/spring3-instrument-tomcat.jar + ls -l /usr/local/tomcat/lib/spring3-instrument-tomcat.jar 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 new file mode 100644 index 00000000..9ebb136c --- /dev/null +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_14.04_tomcat7_full/Dockerfile @@ -0,0 +1,110 @@ +FROM ubuntu:14.04 +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder . +# +# #### FROM ###################################################### +# ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/trusty/Dockerfile +################################################################### + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_LOG="/var/log/tomcat7/catalina.out" \ + 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 apt-get update && \ + apt-get -y --no-install-recommends \ + install wget \ + curl \ + ca-certificates \ + tomcat7 \ + libspring-instrument-java && \ + apt-get clean && \ + apt-get autoremove && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rvf /usr/share/man/* && \ + rm -rvf /usr/share/doc/* && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + chown -R tomcat7:tomcat7 ${LOG_DIR} && \ + chown -R tomcat7:tomcat7 ${CONF_DIR} && \ + echo "\n--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "\n--- Java -----------" >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "\n--- Tomcat ---------" >> ${INFO_FILE} && \ + /usr/share/tomcat7/bin/version.sh >> ${INFO_FILE} && \ + echo "\n--- Contrast-Finder ---" >> ${INFO_FILE} && \ + ln -s /usr/share/java/spring3-instrument-tomcat.jar \ + /usr/share/tomcat7/lib/spring3-instrument-tomcat.jar + + ####################################################################################### + # 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 (...)' + ###################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat7/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_* + +CMD service tomcat7 start ; \ + tail -f -n 600 ${TOMCAT_LOG} \ + ${LOG_FILE} + + + 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 new file mode 100644 index 00000000..46509012 --- /dev/null +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat7_full/Dockerfile @@ -0,0 +1,110 @@ +FROM ubuntu:16.04 +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder . +# +# #### FROM ###################################################### +# ubuntu:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +################################################################### + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_LOG="/var/log/tomcat7/catalina.out" \ + 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 apt-get update && \ + apt-get -y --no-install-recommends \ + install wget \ + curl \ + ca-certificates \ + tomcat7 \ + libspring-instrument-java && \ + apt-get clean && \ + apt-get autoremove && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rvf /usr/share/man/* && \ + rm -rvf /usr/share/doc/* && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + chown -R tomcat7:tomcat7 ${LOG_DIR} && \ + chown -R tomcat7:tomcat7 ${CONF_DIR} && \ + echo "\n--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "\n--- Java -----------" >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "\n--- Tomcat ---------" >> ${INFO_FILE} && \ + /usr/share/tomcat7/bin/version.sh >> ${INFO_FILE} && \ + echo "\n--- Contrast-Finder ---" >> ${INFO_FILE} && \ + ln -s /usr/share/java/spring3-instrument-tomcat.jar \ + /usr/share/tomcat7/lib/spring3-instrument-tomcat.jar + + ####################################################################################### + # 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 (...)' + ###################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat7/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_* + +CMD service tomcat7 start ; \ + tail -f -n 600 ${TOMCAT_LOG} \ + ${LOG_FILE} + + + 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 new file mode 100644 index 00000000..3b48ce6b --- /dev/null +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat8_full/Dockerfile @@ -0,0 +1,110 @@ +FROM ubuntu:16.04 +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder . +# +# #### FROM ###################################################### +# ubuntu:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +################################################################### + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_LOG="/var/log/tomcat8/catalina.out" \ + 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 apt-get update && \ + apt-get -y --no-install-recommends \ + install wget \ + curl \ + ca-certificates \ + tomcat8 \ + libspring-instrument-java && \ + apt-get clean && \ + apt-get autoremove && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rvf /usr/share/man/* && \ + rm -rvf /usr/share/doc/* && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + chown -R tomcat8:tomcat8 ${LOG_DIR} && \ + chown -R tomcat8:tomcat8 ${CONF_DIR} && \ + echo "\n--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "\n--- Java -----------" >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "\n--- Tomcat ---------" >> ${INFO_FILE} && \ + /usr/share/tomcat8/bin/version.sh >> ${INFO_FILE} && \ + echo "\n--- Contrast-Finder ---" >> ${INFO_FILE} && \ + ln -s /usr/share/java/spring3-instrument-tomcat.jar \ + /usr/share/tomcat8/lib/spring3-instrument-tomcat.jar + + ####################################################################################### + # 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 (...)' + ###################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat8/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_* + +CMD service tomcat8 start ; \ + tail -f -n 600 ${TOMCAT_LOG} \ + ${LOG_FILE} + + + 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 new file mode 100644 index 00000000..f7256b5e --- /dev/null +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_18.04_tomcat8_full/Dockerfile @@ -0,0 +1,110 @@ +FROM ubuntu:18.04 +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder . +# +# #### FROM ###################################################### +# ubuntu:18.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +################################################################### + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_LOG="/var/log/tomcat8/catalina.out" \ + 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 apt-get update && \ + apt-get -y --no-install-recommends \ + install wget \ + curl \ + ca-certificates \ + tomcat8 \ + libspring-instrument-java && \ + apt-get clean && \ + apt-get autoremove && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rvf /usr/share/man/* && \ + rm -rvf /usr/share/doc/* && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + chown -R tomcat8:tomcat8 ${LOG_DIR} && \ + chown -R tomcat8:tomcat8 ${CONF_DIR} && \ + echo "\n--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "\n--- Java -----------" >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "\n--- Tomcat ---------" >> ${INFO_FILE} && \ + /usr/share/tomcat8/bin/version.sh >> ${INFO_FILE} && \ + echo "\n--- Contrast-Finder ---" >> ${INFO_FILE} && \ + ln -s /usr/share/java/spring3-instrument.jar \ + /usr/share/tomcat8/lib/spring3-instrument-tomcat.jar + + ####################################################################################### + # 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 (...)' + ###################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat8/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_* + +CMD service tomcat8 start ; \ + tail -f -n 600 ${TOMCAT_LOG} \ + ${LOG_FILE} + + + diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/README.txt b/docker/SNAPSHOT-local/test_tomcat-7-8/README.txt new file mode 100644 index 00000000..58a480d5 --- /dev/null +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/README.txt @@ -0,0 +1,90 @@ + +----- build with jdk7 or jdk8 + + ### JDK 7 + docker pull asqatasun/asqa.mvn:contrast.finder_jdk7 + docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqatasun/asqa.mvn:contrast.finder_jdk7 mvn clean install + docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local/ --log-build + docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqatasun/asqa.mvn:contrast.finder_jdk7 mvn clean + docker exec -ti contrast.finder /bin/bash + cat /var/lib/tomcat8/webapps/contrast-finder/META-INF/MANIFEST.MF + + ### JDK 8 + docker pull asqatasun/asqa.mvn:contrast.finder_jdk8 + docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqatasun/asqa.mvn:contrast.finder_jdk8 mvn clean install + docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local/ --log-build + docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqatasun/asqa.mvn:contrast.finder_jdk8 mvn clean + docker exec -ti contrast.finder /bin/bash + cat /var/lib/tomcat8/webapps/contrast-finder/META-INF/MANIFEST.MF + + +----- without libspring-instrument-java --------------------------------------- + +OK /distrib/debian-8_tomcat-7_legacy-debian +OK /test_tomcat-7-8/Ubuntu_14.04_tomcat7_full +OK /test_tomcat-7-8/Ubuntu_16.04_tomcat7_full +OK /test_tomcat-7-8/Ubuntu_16.04_tomcat8_full +OK /test_tomcat-7-8/Ubuntu_18.04_tomcat8_full + +--------------------------------------------------------------------- + +UBUNTU 18.04 Tomcat 8.5 +----------------------------- +docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_18.04_tomcat8_full/ --log-build +docker exec -ti contrast.finder /bin/cat /softwares-version.txt +docker logs --since 24h contrast.finder &> log_UBUNTU-18.04_tomcat-8_without_SpringInstrumentClassLoader.log +docker exec -ti contrast.finder /bin/bash + ls -l /usr/share/java/spring3-instrument.jar + ls -l /usr/share/tomcat8/lib/spring3-instrument-tomcat.jar + cat /var/lib/tomcat8/webapps/contrast-finder/META-INF/context.xml + cat /var/lib/tomcat8/webapps/contrast-finder/META-INF/MANIFEST.MF + + ---------------------------------------------------------------------------------- + 18.04 vs 16.04 for libspring-instrument-java + https://packages.ubuntu.com/bionic/all/libspring-instrument-java/filelist + vs https://packages.ubuntu.com/xenial/all/libspring-instrument-java/filelist + ---------------------------------------------------------------------------------- + +UBUNTU 16.04 Tomcat 8.0 +----------------------------- +docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat8_full/ --log-build +docker exec -ti contrast.finder /bin/cat /softwares-version.txt +docker logs --since 24h contrast.finder &> log_UBUNTU-16.04_tomcat-8_without_SpringInstrumentClassLoader.log +docker exec -ti contrast.finder /bin/bash + ls -l /usr/share/java/spring3-instrument-tomcat.jar + ls -l /usr/share/tomcat8/lib/spring3-instrument-tomcat.jar + cat /var/lib/tomcat8/webapps/contrast-finder/META-INF/context.xml + cat /var/lib/tomcat8/webapps/contrast-finder/META-INF/MANIFEST.MF + +UBUNTU 16.04 Tomcat 7 +----------------------------- +docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat7_full/ --log-build +docker exec -ti contrast.finder /bin/cat /softwares-version.txt +docker logs --since 24h contrast.finder &> log_UBUNTU-16.04_tomcat-7_without_SpringInstrumentClassLoader.log +docker exec -ti contrast.finder /bin/bash + ls -l /usr/share/java/spring3-instrument-tomcat.jar + ls -l /usr/share/tomcat7/lib/spring3-instrument-tomcat.jar + cat /var/lib/tomcat7/webapps/contrast-finder/META-INF/context.xml + cat /var/lib/tomcat7/webapps/contrast-finder/META-INF/MANIFEST.MF + +UBUNTU 14.04 Tomcat 7 +----------------------------- +docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full --log-build +docker exec -ti contrast.finder /bin/cat /softwares-version.txt +docker logs --since 24h contrast.finder &> log_UBUNTU-14.04_without_SpringInstrumentClassLoader.log +docker exec -ti contrast.finder /bin/bash + ls -l /usr/share/java/spring3-instrument-tomcat.jar + ls -l /usr/share/tomcat7/lib/spring3-instrument-tomcat.jar + cat /var/lib/tomcat7/webapps/contrast-finder/META-INF/context.xml + cat /var/lib/tomcat7/webapps/contrast-finder/META-INF/MANIFEST.MF + +DEBIAN 8 Tomcat 7 +----------------------------- +docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local/distrib/debian-8_tomcat-7_legacy-debian --log-build +docker exec -ti contrast.finder /bin/cat /softwares-version.txt +docker logs --since 24h contrast.finder &> log_DEBIAN-8_without_SpringInstrumentClassLoader.log +docker exec -ti contrast.finder /bin/bash + cat /usr/local/tomcat/webapps/contrast-finder/META-INF/context.xml + cat /usr/local/tomcat/webapps/contrast-finder/META-INF/MANIFEST.MF + ls -l /usr/share/java/spring3-instrument-tomcat.jar + ls -l /usr/local/tomcat/lib/spring3-instrument-tomcat.jar \ No newline at end of file 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 new file mode 100644 index 00000000..5e993da5 --- /dev/null +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full/Dockerfile @@ -0,0 +1,107 @@ +FROM ubuntu:14.04 +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder . +# +# #### FROM ###################################################### +# ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/trusty/Dockerfile +################################################################### + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_LOG="/var/log/tomcat7/catalina.out" \ + 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 apt-get update && \ + apt-get -y --no-install-recommends \ + install wget \ + curl \ + ca-certificates \ + tomcat7 && \ + apt-get clean && \ + apt-get autoremove && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rvf /usr/share/man/* && \ + rm -rvf /usr/share/doc/* && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + chown -R tomcat7:tomcat7 ${LOG_DIR} && \ + chown -R tomcat7:tomcat7 ${CONF_DIR} && \ + echo "\n--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "\n--- Java -----------" >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "\n--- Tomcat ---------" >> ${INFO_FILE} && \ + /usr/share/tomcat7/bin/version.sh >> ${INFO_FILE} && \ + echo "\n--- 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 (...)' + ###################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat7/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_* + +CMD service tomcat7 start ; \ + tail -f -n 600 ${TOMCAT_LOG} \ + ${LOG_FILE} + + + 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 new file mode 100644 index 00000000..24d75615 --- /dev/null +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat7_full/Dockerfile @@ -0,0 +1,107 @@ +FROM ubuntu:16.04 +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder . +# +# #### FROM ###################################################### +# ubuntu:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +################################################################### + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_LOG="/var/log/tomcat7/catalina.out" \ + 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 apt-get update && \ + apt-get -y --no-install-recommends \ + install wget \ + curl \ + ca-certificates \ + tomcat7 && \ + apt-get clean && \ + apt-get autoremove && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rvf /usr/share/man/* && \ + rm -rvf /usr/share/doc/* && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + chown -R tomcat7:tomcat7 ${LOG_DIR} && \ + chown -R tomcat7:tomcat7 ${CONF_DIR} && \ + echo "\n--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "\n--- Java -----------" >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "\n--- Tomcat ---------" >> ${INFO_FILE} && \ + /usr/share/tomcat7/bin/version.sh >> ${INFO_FILE} && \ + echo "\n--- 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 (...)' + ###################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat7/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_* + +CMD service tomcat7 start ; \ + tail -f -n 600 ${TOMCAT_LOG} \ + ${LOG_FILE} + + + 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 new file mode 100644 index 00000000..d14b2c0e --- /dev/null +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat8_full/Dockerfile @@ -0,0 +1,107 @@ +FROM ubuntu:16.04 +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder . +# +# #### FROM ###################################################### +# ubuntu:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +################################################################### + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_LOG="/var/log/tomcat8/catalina.out" \ + 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 apt-get update && \ + apt-get -y --no-install-recommends \ + install wget \ + curl \ + ca-certificates \ + tomcat8 && \ + apt-get clean && \ + apt-get autoremove && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rvf /usr/share/man/* && \ + rm -rvf /usr/share/doc/* && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + chown -R tomcat8:tomcat8 ${LOG_DIR} && \ + chown -R tomcat8:tomcat8 ${CONF_DIR} && \ + echo "\n--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "\n--- Java -----------" >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "\n--- Tomcat ---------" >> ${INFO_FILE} && \ + /usr/share/tomcat8/bin/version.sh >> ${INFO_FILE} && \ + echo "\n--- 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 (...)' + ###################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat8/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_* + +CMD service tomcat8 start ; \ + tail -f -n 600 ${TOMCAT_LOG} \ + ${LOG_FILE} + + + 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 new file mode 100644 index 00000000..69227801 --- /dev/null +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_18.04_tomcat8_full/Dockerfile @@ -0,0 +1,107 @@ +FROM ubuntu:18.04 +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder . +# +# #### FROM ###################################################### +# ubuntu:18.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +################################################################### + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_LOG="/var/log/tomcat8/catalina.out" \ + 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 apt-get update && \ + apt-get -y --no-install-recommends \ + install wget \ + curl \ + ca-certificates \ + tomcat8 && \ + apt-get clean && \ + apt-get autoremove && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rvf /usr/share/man/* && \ + rm -rvf /usr/share/doc/* && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + chown -R tomcat8:tomcat8 ${LOG_DIR} && \ + chown -R tomcat8:tomcat8 ${CONF_DIR} && \ + echo "\n--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "\n--- Java -----------" >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "\n--- Tomcat ---------" >> ${INFO_FILE} && \ + /usr/share/tomcat8/bin/version.sh >> ${INFO_FILE} && \ + echo "\n--- 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 (...)' + ###################################################################### + +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.8.4" + +# 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/tomcat8/webapps && \ + rm -rf /root/contrast-* && \ + echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ + echo "\n--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ + cat ${CONF_FILE} >> ${INFO_FILE} && \ + echo "\n--- 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_* + +CMD service tomcat8 start ; \ + tail -f -n 600 ${TOMCAT_LOG} \ + ${LOG_FILE} + + + diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile deleted file mode 100644 index b7e687c5..00000000 --- a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -FROM tomcat:7.0-jre7 - -# ########################################################## -# -# DISCLAIMER -# -# #### usage ###################################################### -# -# --- Building this docker image -# docker build -t asqatasun/contrast-finder:SNAPSHOT_local_tomcat . -# -# --- Launch a container -# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder:SNAPSHOT_local_tomcat -# -# --- Playing with this docker image -# docker exec -ti contrast.finder /bin/bash -# docker logs -f contrast.finder -# -# -# #### FROM ###################################################### -# tomcat:7.0-jre7 https://github.com/docker-library/tomcat/blob/master/7/jre7/Dockerfile -# |-- openjdk:7-jre https://github.com/docker-library/openjdk/blob/master/7-jre/Dockerfile -# |-- buildpack-deps:jessie-curl https://github.com/docker-library/buildpack-deps/blob/master/jessie/curl/Dockerfile -# |-- debian:jessie https://github.com/tianon/docker-brew-debian/blob/master/jessie/Dockerfile -################################################################### - -# environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.3" -ENV TOMCAT_WEBAPP_DIR="/usr/local/tomcat/webapps" - -# Prepare Contrast-Finder -RUN mkdir -p /var/log/contrast-finder/ \ - && mkdir -p /etc/contrast-finder/ \ - && touch /var/log/contrast-finder/contrast-finder.log \ - && touch /etc/contrast-finder/contrast-finder.conf \ - && echo "piwik_analytics_key=" >> /etc/contrast-finder/contrast-finder.conf \ - && echo "google_analytics_key=" >> /etc/contrast-finder/contrast-finder.conf - -# Add Spring Instrument Tomcat for Tomcat 7 (as this image is based on Tomcat7) -# -# Remark: **not** working for Tomcat 8, see -# http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.html -ADD spring3-instrument-tomcat-3.x.jar /usr/local/tomcat/lib - -# Add Contrast-Finder .war -ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root - -# Install Contrast-Finder -RUN cd /root/contrast-*/install/ && \ - mv -v contrast-*.war contrast-finder.war && \ - mv -v contrast-*.war ${TOMCAT_WEBAPP_DIR} && \ - rm -rf /root/contrast-* diff --git a/docker/SNAPSHOT-local_from-Tomcat/spring3-instrument-tomcat-3.x.jar b/docker/SNAPSHOT-local_from-Tomcat/spring3-instrument-tomcat-3.x.jar deleted file mode 100644 index 6e1095ca..00000000 Binary files a/docker/SNAPSHOT-local_from-Tomcat/spring3-instrument-tomcat-3.x.jar and /dev/null differ diff --git a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile deleted file mode 100644 index a086619b..00000000 --- a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu - -# #### 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/bash -# docker logs -f contrast.finder -# -# -# #### FROM ###################################################### -# asqatasun/contrast-finder:pre-requisites_from-Ubuntu https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile -# |-- ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist/trusty/Dockerfile -################################################################### - -# environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.3" - -# Add contrast-finder .war -ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root - -# Install contrast-finder -RUN cd /root/contrast-*/install/ && \ - mv -v contrast-*.war contrast-finder.war && \ - mv -v contrast-*.war /var/lib/tomcat7/webapps && \ - touch /var/log/contrast-finder/contrast-finder.log && \ - rm -rf /root/contrast-* && echo "-- Install: Ok" - -# Health Check of the Docker Container -# ----> see asqatasun/contrast-finder:pre-requisites_from-Ubuntu - -CMD service tomcat7 start ; \ - tail -f /var/log/tomcat7/catalina.out \ - /var/log/contrast-finder/contrast-finder.log - - - diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile deleted file mode 100644 index a828216a..00000000 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu - -# #### 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/bash -# docker logs -f contrast.finder -# -# -# #### FROM ###################################################### -# asqatasun/contrast-finder:pre-requisites_from-Ubuntu https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile -# |-- ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist/trusty/Dockerfile -################################################################### - -# environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.3" -ENV CONF_DEFAULT_ALGO="Rgb" - # ENV CONF_DEFAULT_ALGO="Rgb" - # ENV CONF_DEFAULT_ALGO="HSV" - # ENV CONF_DEFAULT_ALGO="Bad_Algo" - -# Add contrast-finder .war -ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root - -# Install contrast-finder -RUN cd /root/contrast-*/install/ && \ - mv -v contrast-*.war contrast-finder.war && \ - mv -v contrast-*.war /var/lib/tomcat7/webapps && \ - touch /var/log/contrast-finder/contrast-finder.log && \ - rm -rf /root/contrast-* && echo "-- Install: Ok" - -CMD echo "default_algorithm=${CONF_DEFAULT_ALGO}" >> /etc/contrast-finder/contrast-finder.conf ; \ - service tomcat7 start ; \ - tail -f /var/log/tomcat7/catalina.out \ - /var/log/contrast-finder/contrast-finder.log diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile deleted file mode 100644 index 43d1a528..00000000 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu - -# #### 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/bash -# docker logs -f contrast.finder -# -# -# #### FROM ###################################################### -# asqatasun/contrast-finder:pre-requisites_from-Ubuntu https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile -# |-- ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist/trusty/Dockerfile -################################################################### - -# environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.3" -ENV CONF_ENV="debug" - -# Add contrast-finder .war -ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root - -# Install contrast-finder -RUN cd /root/contrast-*/install/ && \ - mv -v contrast-*.war contrast-finder.war && \ - mv -v contrast-*.war /var/lib/tomcat7/webapps && \ - touch /var/log/contrast-finder/contrast-finder.log && \ - rm -rf /root/contrast-* && echo "-- Install: Ok" - -CMD echo "env=${CONF_ENV}" >> /etc/contrast-finder/contrast-finder.conf ; \ - service tomcat7 start ; \ - tail -f /var/log/tomcat7/catalina.out \ - /var/log/contrast-finder/contrast-finder.log diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile deleted file mode 100644 index 8c0321b5..00000000 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu - -# #### 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/bash -# docker logs -f contrast.finder -# -# -# #### FROM ###################################################### -# asqatasun/contrast-finder:pre-requisites_from-Ubuntu https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile -# |-- ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist/trusty/Dockerfile -################################################################### - -# environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.3" -ENV PIWIK_KEY="9" -ENV PIWIK_URL="http://localhost/piwik/" - -# Add contrast-finder .war -ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root - -# Install contrast-finder -RUN cd /root/contrast-*/install/ && \ - mv -v contrast-*.war contrast-finder.war && \ - mv -v contrast-*.war /var/lib/tomcat7/webapps && \ - touch /var/log/contrast-finder/contrast-finder.log && \ - echo "piwik_analytics_key=${PIWIK_KEY}" > /etc/contrast-finder/contrast-finder.conf && \ - echo "piwik_analytics_server=${PIWIK_URL}" >> /etc/contrast-finder/contrast-finder.conf && \ - rm -rf /root/contrast-* && echo "-- Install: Ok" - -CMD service tomcat7 start ; \ - tail -f /var/log/tomcat7/catalina.out \ - /var/log/contrast-finder/contrast-finder.log - - - diff --git a/docker/build_and_run-with-docker.sh b/docker/build_and_run-with-docker.sh index 89bbe2f6..bba54c0b 100755 --- a/docker/build_and_run-with-docker.sh +++ b/docker/build_and_run-with-docker.sh @@ -346,6 +346,7 @@ function view_build_summary () { echo " Image ....... ${IMAGE_NAME}:${TAG_NAME}" echo " CMD ......... ${DOCKER_RUN}" echo " -------------------------------------------------------" + echo " Info ........ ${SUDO}docker exec -ti ${CONTAINER_NAME} /bin/cat /softwares-version.txt" echo " Shell ....... ${SUDO}docker exec -ti ${CONTAINER_NAME} /bin/bash" echo " Log ......... ${SUDO}docker logs -f ${CONTAINER_NAME}" echo " URL ......... ${BOLD}${GREEN}${URL_APP}${NORM}" diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile b/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile new file mode 100644 index 00000000..b2c65fe7 --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile @@ -0,0 +1,75 @@ +FROM tomcat:7-jre7-alpine +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder:pre-requisites_Alpine_tomcat-7 . +# +# #### FROM ###################################################### +# tomcat:7-jre7-alpine https://github.com/docker-library/tomcat/blob/master/7/jre7-alpine/Dockerfile +# |-- openjdk:7-jre-alpine https://github.com/docker-library/openjdk/blob/master/7-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:7-jre7-alpine" DockerFile +# CMD ["catalina.sh", "run"] diff --git a/docker/pre-requisites/pre-requisites_from-Ubuntu/README.md b/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/README.md similarity index 100% rename from docker/pre-requisites/pre-requisites_from-Ubuntu/README.md rename to docker/pre-requisites/pre-requisites_Alpine_tomcat-7/README.md diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile b/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile new file mode 100644 index 00000000..75dcee8f --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile @@ -0,0 +1,76 @@ +FROM tomcat:8.5-jre8-alpine +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder:pre-requisites_Alpine_tomcat-8.5 . +# +# #### FROM ###################################################### +# tomcat:8.5-jre8-alpine https://github.com/docker-library/tomcat/blob/master/8.5/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:8.5-jre8-alpine" DockerFile +# CMD ["catalina.sh", "run"] + diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/README.md b/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/README.md new file mode 120000 index 00000000..8e1029b1 --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/README.md @@ -0,0 +1 @@ +../../RELEASE/README.md \ No newline at end of file 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 new file mode 100644 index 00000000..6361606a --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile @@ -0,0 +1,80 @@ +FROM debian:9 +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder:pre-requisites_Debian-9_tomcat-8.5 . +# +# #### FROM ###################################################### +# debian:9 https://github.com/debuerreotype/docker-debian-artifacts/blob/dist-amd64/stretch/Dockerfile +################################################################### + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_LOG="/var/log/tomcat8/catalina.out" \ + 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 apt-get update && \ + apt-get -y --no-install-recommends \ + install wget \ + curl \ + ca-certificates \ + tomcat8 && \ + apt-get clean && \ + apt-get autoremove && \ + rm -rvf /var/lib/apt/lists/* && \ + rm -rvf /usr/share/man/* && \ + rm -rvf /usr/share/doc/* && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + chown -R tomcat8:tomcat8 ${LOG_DIR} && \ + chown -R tomcat8:tomcat8 ${CONF_DIR} && \ + echo "\n--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "\n--- Java -----------" >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "\n--- Tomcat ---------" >> ${INFO_FILE} && \ + /usr/share/tomcat8/bin/version.sh >> ${INFO_FILE} && \ + echo "\n--- 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 (...)' + ###################################################################### + +CMD service tomcat8 start ; \ + tail -f ${TOMCAT_LOG} + + diff --git a/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/README.md b/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/README.md new file mode 120000 index 00000000..8e1029b1 --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/README.md @@ -0,0 +1 @@ +../../RELEASE/README.md \ No newline at end of file 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 new file mode 100644 index 00000000..8c1fd772 --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile @@ -0,0 +1,80 @@ +FROM ubuntu:14.04 +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 . +# +# #### FROM ###################################################### +# ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/trusty/Dockerfile +################################################################### + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_LOG="/var/log/tomcat7/catalina.out" \ + 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 apt-get update && \ + apt-get -y --no-install-recommends \ + install wget \ + curl \ + ca-certificates \ + tomcat7 && \ + apt-get clean && \ + apt-get autoremove && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rvf /usr/share/man/* && \ + rm -rvf /usr/share/doc/* && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + chown -R tomcat7:tomcat7 ${LOG_DIR} && \ + chown -R tomcat7:tomcat7 ${CONF_DIR} && \ + echo "\n--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "\n--- Java -----------" >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "\n--- Tomcat ---------" >> ${INFO_FILE} && \ + /usr/share/tomcat7/bin/version.sh >> ${INFO_FILE} && \ + echo "\n--- 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 (...)' + ###################################################################### + +CMD service tomcat7 start ; \ + tail -f ${TOMCAT_LOG} + diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/README.md b/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/README.md new file mode 120000 index 00000000..8e1029b1 --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/README.md @@ -0,0 +1 @@ +../../RELEASE/README.md \ No newline at end of file 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 new file mode 100644 index 00000000..aac705e4 --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile @@ -0,0 +1,80 @@ +FROM ubuntu:16.04 +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 . +# +# #### FROM ###################################################### +# ubuntu:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +################################################################### + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_LOG="/var/log/tomcat7/catalina.out" \ + 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 apt-get update && \ + apt-get -y --no-install-recommends \ + install wget \ + curl \ + ca-certificates \ + tomcat7 && \ + apt-get clean && \ + apt-get autoremove && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rvf /usr/share/man/* && \ + rm -rvf /usr/share/doc/* && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + chown -R tomcat7:tomcat7 ${LOG_DIR} && \ + chown -R tomcat7:tomcat7 ${CONF_DIR} && \ + echo "\n--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "\n--- Java -----------" >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "\n--- Tomcat ---------" >> ${INFO_FILE} && \ + /usr/share/tomcat7/bin/version.sh >> ${INFO_FILE} && \ + echo "\n--- 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 (...)' + ###################################################################### + +CMD service tomcat7 start ; \ + tail -f ${TOMCAT_LOG} + + diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/README.md b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/README.md new file mode 120000 index 00000000..8e1029b1 --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/README.md @@ -0,0 +1 @@ +../../RELEASE/README.md \ No newline at end of file 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 new file mode 100644 index 00000000..aa129b11 --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile @@ -0,0 +1,80 @@ +FROM ubuntu:16.04 +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-8.0 . +# +# #### FROM ###################################################### +# ubuntu:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +################################################################### + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_LOG="/var/log/tomcat8/catalina.out" \ + 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 apt-get update && \ + apt-get -y --no-install-recommends \ + install wget \ + curl \ + ca-certificates \ + tomcat8 && \ + apt-get clean && \ + apt-get autoremove && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rvf /usr/share/man/* && \ + rm -rvf /usr/share/doc/* && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + chown -R tomcat8:tomcat8 ${LOG_DIR} && \ + chown -R tomcat8:tomcat8 ${CONF_DIR} && \ + echo "\n--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "\n--- Java -----------" >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "\n--- Tomcat ---------" >> ${INFO_FILE} && \ + /usr/share/tomcat8/bin/version.sh >> ${INFO_FILE} && \ + echo "\n--- 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 (...)' + ###################################################################### + +CMD service tomcat8 start ; \ + tail -f ${TOMCAT_LOG} + + diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/README.md b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/README.md new file mode 120000 index 00000000..8e1029b1 --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/README.md @@ -0,0 +1 @@ +../../RELEASE/README.md \ No newline at end of file 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 new file mode 100644 index 00000000..99d2056c --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile @@ -0,0 +1,80 @@ +FROM ubuntu:18.04 +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" + # ----> documentation http://label-schema.org/ + +# #### usage ###################################################### +# +# --- Building this docker image +# docker build -t contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 . +# +# #### FROM ###################################################### +# ubuntu:18.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/bionic/Dockerfile +################################################################### + +# build variables +ARG LOG_DIR="/var/log/contrast-finder/" +ARG CONF_DIR="/etc/contrast-finder/" + +# environment variables +ENV TOMCAT_LOG="/var/log/tomcat8/catalina.out" \ + 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 apt-get update && \ + apt-get -y --no-install-recommends \ + install wget \ + curl \ + ca-certificates \ + tomcat8 && \ + apt-get clean && \ + apt-get autoremove && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rvf /usr/share/man/* && \ + rm -rvf /usr/share/doc/* && \ + mkdir -p ${LOG_DIR} && \ + mkdir -p ${CONF_DIR} && \ + touch ${LOG_FILE} && \ + touch ${CONF_FILE} && \ + chown -R tomcat8:tomcat8 ${LOG_DIR} && \ + chown -R tomcat8:tomcat8 ${CONF_DIR} && \ + echo "\n--- OS -------------" >> ${INFO_FILE} && \ + cat /etc/os-release >> ${INFO_FILE} && \ + echo "\n--- Java -----------" >> ${INFO_FILE} && \ + java -version 2>> ${INFO_FILE} && \ + echo "\n--- Tomcat ---------" >> ${INFO_FILE} && \ + /usr/share/tomcat8/bin/version.sh >> ${INFO_FILE} && \ + echo "\n--- 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 (...)' + ###################################################################### + +CMD service tomcat8 start ; \ + tail -f ${TOMCAT_LOG} + + diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/README.md b/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/README.md new file mode 120000 index 00000000..8e1029b1 --- /dev/null +++ b/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/README.md @@ -0,0 +1 @@ +../../RELEASE/README.md \ No newline at end of file diff --git a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile b/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile deleted file mode 100644 index 97b925a8..00000000 --- a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile +++ /dev/null @@ -1,59 +0,0 @@ -FROM ubuntu:14.04 -LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ - org.label-schema.name = "Contrast-Finder - WebApp pre-requisites" \ - org.label-schema.version = "0.8.3" \ - org.label-schema.url = "https://contrast-finder.org" \ - org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" - # ----> documentation http://label-schema.org/ - -# #### usage ###################################################### -# -# --- Building this docker image -# docker build -t contrast-finder:pre-requisites_from-Ubuntu . -# -# #### FROM ###################################################### -# ubuntu:14.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist/trusty/Dockerfile -################################################################### - - -# environment variables -ENV CONF_FILE="/etc/contrast-finder/contrast-finder.conf" \ - WWWPORT="8080" -EXPOSE $WWWPORT - -# build -RUN apt-get update && \ - apt-get -y --no-install-recommends \ - install wget \ - curl \ - ca-certificates \ - tomcat7 \ - libspring-instrument-java && \ - apt-get clean && \ - apt-get autoremove && \ - rm -rf /var/lib/apt/lists/* && \ - mkdir -p /var/log/contrast-finder/ && \ - mkdir -p /etc/contrast-finder/ && \ - touch /var/log/contrast-finder/contrast-finder.log && \ - touch ${CONF_FILE} && \ - chown -R tomcat7:tomcat7 /var/log/contrast-finder/ && \ - chown -R tomcat7:tomcat7 /etc/contrast-finder/ && \ - ln -s /usr/share/java/spring3-instrument-tomcat.jar \ - /usr/share/tomcat7/lib/spring3-instrument-tomcat.jar - - -# 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 (...)' - ###################################################################### - -CMD service tomcat7 start ; \ - tail -f /var/log/tomcat7/catalina.out - - diff --git a/documentation/en/10_Install_doc/webapp_Installation.md b/documentation/en/10_Install_doc/webapp_Installation.md index 6965054e..7cd0ff50 100644 --- a/documentation/en/10_Install_doc/webapp_Installation.md +++ b/documentation/en/10_Install_doc/webapp_Installation.md @@ -11,10 +11,10 @@ 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.4.5/contrast-finder_0.4.5.i386.tar.gz -tar -xzvf contrast-finder*.tar.gz -cd contrast-finder_*.i386/ -mv -v install/contrast-*.war contrast-finder.war +wget https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.4/contrast-finder-webapp_0.8.4.tar.gz +tar -xzvf contrast-finder-webapp_*.tar.gz +cd contrast-finder-webapp_*/ +mv -v install/contrast-finder-webapp_*.war contrast-finder.war sudo cp -v contrast-finder.war /var/lib/tomcat7/webapps/ sudo cp -rv install/var/log/contrast-finder/ /var/log/ @@ -29,8 +29,8 @@ Contrast-finder should be available at `http://localhost:8080/contrast-finder/` #### Optional contract-finder.conf file ```bash -tar -xzvf contrast-finder*.tar.gz -cd contrast-finder_*.i386/ +tar -xzvf contrast-finder-webapp_*.tar.gz +cd contrast-finder-webapp_*/ sudo cp -rv install/etc/contrast-finder/ /etc/ cd /etc/contrast-finder/ diff --git a/documentation/en/10_Install_doc/webapp_Pre-requisites.md b/documentation/en/10_Install_doc/webapp_Pre-requisites.md index a89b8f11..4e2dc06d 100644 --- a/documentation/en/10_Install_doc/webapp_Pre-requisites.md +++ b/documentation/en/10_Install_doc/webapp_Pre-requisites.md @@ -2,15 +2,17 @@ ## Prerequesites -* Tomcat -* libspring-instrument-java +* Tomcat 7 or Tomcat 8 + ### Linux Ubuntu 14.04 and 16.04 ```bash -apt-get --no-install-recommends install tomcat7 -apt-get --no-install-recommends install libspring-instrument-java -ln -s /usr/share/java/spring3-instrument-tomcat.jar \ - /usr/share/tomcat7/lib/spring3-instrument-tomcat.jar +apt-get --no-install-recommends install tomcat7 ``` +### Linux Ubuntu 16.04 + +```bash +apt-get --no-install-recommends install tomcat8 +``` diff --git a/documentation/en/30_Contributor_doc/Build/Build_Docker_image.md b/documentation/en/30_Contributor_doc/Build/Build_Docker_image.md index 047a4bc8..c5417b35 100644 --- a/documentation/en/30_Contributor_doc/Build/Build_Docker_image.md +++ b/documentation/en/30_Contributor_doc/Build/Build_Docker_image.md @@ -5,7 +5,7 @@ The following sofware are required : -* JDK **7** (at least) +* JDK **8** (at least) * Maven **3.1** (at least) * [Docker **1.12** (at least)](https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/) @@ -24,7 +24,7 @@ To enjoy it, do: git clone https://github.com/Asqatasun/Contrast-Finder cd Contrast-finder git checkout develop -docker/build_and_run-with-docker.sh --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local_from-Ubuntu +docker/build_and_run-with-docker.sh --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local ``` In your browser, go to @@ -42,7 +42,7 @@ Example of output: maven WARN ...... 12 ------------------------------------------------------- Container ... contrast.finder - Dockerfile .. docker/SNAPSHOT-local_from-Ubuntu + Dockerfile .. docker/SNAPSHOT-local Image ....... asqatasun/contrast-finder:2017-09-30 CMD ......... docker run -p 8087:8080 --name contrast.finder -d asqatasun/contrast-finder:2017-09-30 ------------------------------------------------------- @@ -84,13 +84,13 @@ In the meantime, enjoy your coffee break :) ### 3. Copy Contrast-finder tar.gz to the suitable Docker directory ```shell -cp -v contrast-finder-webapp/target/*.tar.gz docker/SNAPSHOT-local_from-Ubuntu +cp -v contrast-finder-webapp/target/*.tar.gz docker/SNAPSHOT-local ``` ### 4. Build the Docker Image ```shell -cd docker/SNAPSHOT-local_from-Ubuntu +cd docker/SNAPSHOT-local docker build -t asqatasun/contrast-finder:SNAPSHOT . ``` diff --git a/documentation/en/30_Contributor_doc/Build/Build_contrast-finer.md b/documentation/en/30_Contributor_doc/Build/Build_contrast-finer.md index e6f78fd7..4aeae4a6 100644 --- a/documentation/en/30_Contributor_doc/Build/Build_contrast-finer.md +++ b/documentation/en/30_Contributor_doc/Build/Build_contrast-finer.md @@ -2,7 +2,7 @@ ## Prerequesites -* JDK-7 (at least) is required +* JDK-8 (at least) is required * Maven 3.1 (at least) is required * Git @@ -13,7 +13,7 @@ Replace only this following command line: ```bash -wget https://github.com/Asqatasun/Contrast-Finder/releases/download/(...).i386.tar.gz +wget https://github.com/Asqatasun/Contrast-Finder/releases/download/(...).tar.gz ``` by these following command lines: @@ -22,6 +22,6 @@ git clone https://github.com/Asqatasun/Contrast-Finder cd Contrast-finder git checkout develop mvn clean install -cp contrast-finder-webapp/target/contrast-finder_*-SNAPSHOT.i386.tar.gz /tmp +cp contrast-finder-webapp/target/contrast-finder-webapp_*-SNAPSHOT.tar.gz /tmp cd /tmp ``` diff --git a/documentation/en/30_Contributor_doc/Build/README.md b/documentation/en/30_Contributor_doc/Build/README.md index c855481e..9ea72429 100644 --- a/documentation/en/30_Contributor_doc/Build/README.md +++ b/documentation/en/30_Contributor_doc/Build/README.md @@ -1,6 +1,6 @@ # Building Contrast-Finder -**Note:** JDK 7 (at least) and Maven 3.1 (at least) are required. +**Note:** JDK 8 (at least) and Maven 3.1 (at least) are required. * [Build Contrast-Finder](Build_contrast-finer.md) * [Build Docker image](Build_Docker_image.md) diff --git a/documentation/en/30_Contributor_doc/QA-tools.md b/documentation/en/30_Contributor_doc/QA-tools.md new file mode 100644 index 00000000..6635aeae --- /dev/null +++ b/documentation/en/30_Contributor_doc/QA-tools.md @@ -0,0 +1,91 @@ + +# QA tools + +## Online QA tools for app.contrast-finder.org + +`*` preconfigured tools + +* Security + * [Hardenize](https://www.hardenize.com) (DNS, SMTP, web server) + * [Mozilla Observatory](https://observatory.mozilla.org/analyze.html?host=app.contrast-finder.org) `*` (HTTP header, SSL, cookies, ...) + * [Security Headers](https://securityheaders.io/?q=https://app.contrast-finder.org) `*` (HTTP header) + * Content-Security-Policy (CSP) + * [cspvalidator.org](https://cspvalidator.org/#url=https://app.contrast-finder.org) `*` + * [csp-evaluator.withgoogle.com](https://csp-evaluator.withgoogle.com/?csp=https://app.contrast-finder.org) `*` + * SSL + * [ssllabs.com](https://www.ssllabs.com/ssltest/analyze?d=app.contrast-finder.org) `*` + * [tls.imirhil.fr](https://tls.imirhil.fr/https/app.contrast-finder.org) `*` +* W3C tools + * [HTML validator](https://validator.w3.org/nu/?doc=https://app.contrast-finder.org&showsource=yes&showoutline=yes&showimagereport=yes) `*` + * [CSS validator](https://jigsaw.w3.org/css-validator/validator?uri=https://app.contrast-finder.org&profile=css3) `*` + * [Link checker](https://validator.w3.org/checklink?uri=https://app.contrast-finder.org&hide_type=all&depth=&check=Check) `*` + * [i18n checker](https://validator.w3.org/i18n-checker/check?uri=https://app.contrast-finder.org) `*` + * [i18n checker for **/?lang=en**](https://validator.w3.org/i18n-checker/check?uri=https://app.contrast-finder.org/?lang=en) `*` + * [i18n checker for **/?lang=fr**](https://validator.w3.org/i18n-checker/check?uri=https://app.contrast-finder.org/?lang=fr) `*` + * [i18n checker for **/?lang=pt**](https://validator.w3.org/i18n-checker/check?uri=https://app.contrast-finder.org/?lang=pt) `*` + * [i18n checker for **/?lang=ko**](https://validator.w3.org/i18n-checker/check?uri=https://app.contrast-finder.org/?lang=ko) `*` +* Web accessibility + * [Asqatasun](https://app.asqatasun.org) +* Web perf + * [Yellowlab](http://yellowlab.tools) + * [Webpagetest](https://www.webpagetest.org/) + * [Test a single asset from 14 locations](https://tools.keycdn.com/performance?url=https://app.contrast-finder.org) `*` +* HTTP/2 + * [Http2.pro](https://http2.pro/check?url=https://app.contrast-finder.org) `*` (check server HTTP/2, ALPN, and Server-push support) +* Global tools (webperf, accessibility, security, ...) + * [Dareboost](https://www.dareboost.com) (free trial) + * [Sonarwhal](https://sonarwhal.com/scanner/) + +* Social networks + * [Twitter card validator](https://cards-dev.twitter.com/validator) +* structured data (JSON-LD, rdf, schema.org, microformats.org, ...) + * [Google structured data testing tool](https://search.google.com/structured-data/testing-tool#url=https://app.contrast-finder.org/) `*` + * [Yandex structured data testing tool](https://webmaster.yandex.com/tools/microtest/) + * [Structured Data Linter](http://linter.structured-data.org/?url=https://app.contrast-finder.org) `*` + * [Microdata Parser](http://tools.seomoves.org/microdata/) +* Google image + * [images used on the website](https://www.google.fr/search?tbm=isch&q=site:app.contrast-finder.org) `*` (site:app.contrast-finder.org) + * [images used on the website but hosted on other domains](https://www.google.fr/search?tbm=isch&q=site:app.contrast-finder.org+-src:app.contrast-finder.org) `*` (site:app.contrast-finder.org -src:app.contrast-finder.org) + * [images hosted on the domain name](https://www.google.fr/search?tbm=isch&q=src:app.contrast-finder.org) `*` (src:app.contrast-finder.org) + * [images hosted on the domain name and used by other domain names (hotlinks)](https://www.google.fr/search?tbm=isch&q=src:app.contrast-finder.org+-site:app.contrast-finder.org) `*` (src:app.contrast-finder.org -site:app.contrast-finder.org) + +## Open-source softwares + +* [W3C tools](https://w3c.github.io/developers/tools/#tools) +* Security + * [Arachni](https://github.com/Arachni/arachni) (web application security scanner framework) + * Content-Security-Policy (CSP) + * [salvation](https://github.com/shapesecurity/salvation) (Java parser, warn about policy errors) + * Mozilla Observatory + * [CLI client for Mozilla Observatory](https://github.com/mozilla/observatory-cli) + * [HTTP Observatory](https://github.com/mozilla/http-observatory) (local scanner : CLI and CI) +* Web accessibility + * Asqatasun + * [Asqatsun Docker image](https://hub.docker.com/r/asqatasun/asqatasun/) + * [Install Asqatasun on a server](https://doc.asqatasun.org/en/10_Install_doc/Asqatasun/) +* Web perf + * Webpagetest + * [Yellowlab](https://github.com/gmetais/YellowLabTools/) (API, npm CLI, Grunt task, ...) + * [Sitespeed.io](https://www.sitespeed.io/) (npm or docker is needed) +* Global tools + * [Sonarwhal](https://github.com/sonarwhal/sonarwhal) (Node.js v8) + +## Audit history + +### 0.8.3 +* Security + * https://www.hardenize.com/report/app.contrast-finder.org/1516756341 +* Web perf + * https://www.webpagetest.org/result/180124_KC_d6495475e9d7beed0e79583dd9e207b2/ + * http://yellowlab.tools/result/exn8ef7di1 +* Global tools (webperf, accessibility, security, ...) + * https://www.dareboost.com/en/report/5a67f2c60cf2b528a73f6dde + * https://sonarwhal.com/scanner/6699688c-0363-4d0b-a636-add8a2f9d909 + + + + + + + + \ No newline at end of file diff --git a/documentation/en/30_Contributor_doc/README.md b/documentation/en/30_Contributor_doc/README.md index 5c8344a1..07cdf369 100644 --- a/documentation/en/30_Contributor_doc/README.md +++ b/documentation/en/30_Contributor_doc/README.md @@ -6,10 +6,10 @@ ----- * Checking for new dependency / plugin updates * OWASP Dependency-Check +* Code coverage * Checkstyle * JavaDoc - ## Checking for new dependency / plugin updates ```bash # Checking for new dependency updates @@ -59,6 +59,35 @@ mvn dependency-check:help -Ddetail=true -Dgoal=aggregate * http://jeremylong.github.io/DependencyCheck/ * http://jeremylong.github.io/DependencyCheck/dependency-check-maven/ +## Code coverage + +no aggregate report (if you know how to do it…) + +### Jacoco + +#### Documentation +* http://www.jacoco.org/jacoco/ +* https://github.com/jacoco/jacoco/ + +#### Usage +```bash +mvn clean install + # report: engine/*/target/site/jacoco +``` + +### Cobertura + +#### Documentation +* http://www.mojohaus.org/cobertura-maven-plugin/ +* https://github.com/cobertura/cobertura + +#### Usage +```bash +mvn cobertura:cobertura + # report: engine/*/target/site/cobertura +``` + + ## Checkstyle Scan Contrast-Finder to check the violations of a coding standard. diff --git a/documentation/en/30_Contributor_doc/Release/README.md b/documentation/en/30_Contributor_doc/Release/README.md index f953763b..ecc8bd99 100644 --- a/documentation/en/30_Contributor_doc/Release/README.md +++ b/documentation/en/30_Contributor_doc/Release/README.md @@ -11,7 +11,7 @@ As an end user, you won't need it, it is just for developers. mvn dependency-check:aggregate # compile and test it - docker/build_and_run-with-docker.sh -l -s ${PWD} -d docker/SNAPSHOT-local_from-Ubuntu + docker/build_and_run-with-docker.sh -l -s ${PWD} -d docker/SNAPSHOT-local ``` @@ -63,7 +63,7 @@ Another plugin to do some of the work (not tested): ### Test it ```bash # compile and test it -docker/build_and_run-with-docker.sh -l -s ${PWD} -d docker/SNAPSHOT-local_from-Ubuntu +docker/build_and_run-with-docker.sh -l -s ${PWD} -d docker/SNAPSHOT-local ``` ### Release @@ -81,44 +81,33 @@ docker run -d -p 8080:8080 asqatasun/contrast-finder # docker hub : manage new build for asqatasun/asqa.mvn:contrast.finder_jdk* ``` +### Prepare develop branch for the next release +```bash +# 1. change version ("x.y.z" to "x.y.z+1-SNAPSHOT") + # */pom.xml + # */Dockerfile + # CHANGELOG + # Docker/REALESE/README + # (...)/template_variables.jspf +git checkout develop -## Versioning - -We tend to follow the [semantic versioning](http://semver.org/) recommendations. +# for pom.xml files +mvn versions:set -DnewVersion=x.y.z+1 +mvn versions:commit # remove pom.xml.versionsBackup files -## Changelog template +# for these following files + # */Dockerfile + # CHANGELOG + # Docker/REALESE/README + # (...)/template_variables.jspf +(...) +# 2. commit +git add . +git commit -m "set version to x.y.z+1-SNAPSHOT" ``` -Contrast-Finder M.m.p, 2017-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 +## Versioning -### Task -none +We tend to follow the [semantic versioning](http://semver.org/) recommendations. -``` \ No newline at end of file diff --git a/documentation/en/30_Contributor_doc/Release/template_CHANGELOG.md b/documentation/en/30_Contributor_doc/Release/template_CHANGELOG.md new file mode 100644 index 00000000..8527b5e4 --- /dev/null +++ b/documentation/en/30_Contributor_doc/Release/template_CHANGELOG.md @@ -0,0 +1,42 @@ +## Changelog template + +## Versioning + +We tend to follow the [semantic versioning](http://semver.org/) recommendations. + +## Template + +``` +Contrast-Finder M.m.p, 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 + +``` \ No newline at end of file diff --git a/documentation/en/30_Contributor_doc/bookmarks-for-potential-features.md b/documentation/en/30_Contributor_doc/bookmarks-for-potential-features.md new file mode 100644 index 00000000..2efc9be3 --- /dev/null +++ b/documentation/en/30_Contributor_doc/bookmarks-for-potential-features.md @@ -0,0 +1,39 @@ +# Bookmarks for potential features + + +## Tomcat 8 + +For Tomcat 7, Contrast-Finder need "Spring Instrument Tomcat": +``` +apt-get --no-install-recommends install libspring-instrument-java +ln -s /usr/share/java/spring3-instrument-tomcat.jar \ + /usr/share/tomcat7/lib/spring3-instrument-tomcat.jar +``` + +but it's **not** working for Tomcat 8 + +- https://forum.asqatasun.org/t/lib-spring-instrument-java-tomcat8/258/2 +- https://docs.spring.io/spring/docs/4.3.13.RELEASE/spring-framework-reference/htmlsingle/#aop-aj-ltw-environment-tomcat + +``` +Historically, Tomcat's default class loader did not support class transformation +which is why Spring provides an enhanced implementation that addresses this need. +Named TomcatInstrumentableClassLoader, the loader works on Tomcat 6.0 and above. + +Do not define TomcatInstrumentableClassLoader anymore on Tomcat 8.0 and higher. +Instead, let Spring automatically use Tomcat’s new native InstrumentableClassLoader +facility through the TomcatLoadTimeWeaver strategy. +``` + +For Tomcat 8, don't install libspring-instrument-java +and remove the following line from the [webapp/src/main/webapp/META-INF/context.xml](https://github.com/Asqatasun/Contrast-Finder/blob/develop/webapp/src/main/webapp/META-INF/context.xml#L3) file +and it's works: +> + + +## Ansible + +- https://github.com/ansible/ansible-examples/tree/master/tomcat-standalone +- https://github.com/elacheche/ansible-war-deploy +- http://aseigneurin.github.io/2014/11/04/ansible-pour-deployer-des-applications.html + - https://github.com/aseigneurin/ansible-sandbox \ No newline at end of file diff --git a/documentation/en/30_Contributor_doc/i18n/README.md b/documentation/en/30_Contributor_doc/i18n/README.md index 49fb5b94..30b3ff47 100644 --- a/documentation/en/30_Contributor_doc/i18n/README.md +++ b/documentation/en/30_Contributor_doc/i18n/README.md @@ -12,6 +12,7 @@ form.resultNumber={0} {0,choice,1#resultado|1 org.asqatasun contrast-finder - 0.8.3 + 0.8.4 documentation pom - 0.8.3 + 0.8.4 contrast-finder-documentation @@ -29,6 +29,7 @@ com.ruleoftech markdown-page-generator-plugin + ${markdown-page-generator-plugin.version} process-sources diff --git a/engine/api/pom.xml b/engine/api/pom.xml index 33946f9f..797a1982 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.3 + 0.8.4 contrast-finder-api - 0.8.3 + 0.8.4 jar api diff --git a/engine/api/src/main/java/org/asqatasun/contrastfinder/AbstractColorFinder.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/AbstractColorFinder.java index 10b4871a..c459ca5c 100644 --- a/engine/api/src/main/java/org/asqatasun/contrastfinder/AbstractColorFinder.java +++ b/engine/api/src/main/java/org/asqatasun/contrastfinder/AbstractColorFinder.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/api/src/main/java/org/asqatasun/contrastfinder/ColorFinder.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/ColorFinder.java index ee84c993..1658fa46 100644 --- a/engine/api/src/main/java/org/asqatasun/contrastfinder/ColorFinder.java +++ b/engine/api/src/main/java/org/asqatasun/contrastfinder/ColorFinder.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/api/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactory.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactory.java index 77a8736d..2f2bef9d 100644 --- a/engine/api/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactory.java +++ b/engine/api/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactory.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/api/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaison.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaison.java index d66c3173..42fb0a5a 100644 --- a/engine/api/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaison.java +++ b/engine/api/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaison.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/api/src/main/java/org/asqatasun/contrastfinder/result/ColorResult.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/result/ColorResult.java index f88fa605..33315e9d 100644 --- a/engine/api/src/main/java/org/asqatasun/contrastfinder/result/ColorResult.java +++ b/engine/api/src/main/java/org/asqatasun/contrastfinder/result/ColorResult.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactory.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactory.java index fdccff35..43427a69 100644 --- a/engine/api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactory.java +++ b/engine/api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactory.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactory.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactory.java index febc76d7..3955b0eb 100644 --- a/engine/api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactory.java +++ b/engine/api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactory.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/hsv/pom.xml b/engine/hsv/pom.xml index cf0b5c22..fb02ba6e 100644 --- a/engine/hsv/pom.xml +++ b/engine/hsv/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.3 + 0.8.4 contrast-finder-hsv - 0.8.3 + 0.8.4 jar hsv diff --git a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvFactory.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvFactory.java index 4de3dd04..5212d5d3 100644 --- a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvFactory.java +++ b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvFactory.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvPsychoFactory.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvPsychoFactory.java index 907473d0..008b0068 100644 --- a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvPsychoFactory.java +++ b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvPsychoFactory.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderRgbFactory.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderRgbFactory.java index a66699a5..84904f35 100644 --- a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderRgbFactory.java +++ b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderRgbFactory.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/Boundary.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/Boundary.java index 988f3e36..dccf532b 100644 --- a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/Boundary.java +++ b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/Boundary.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsv.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsv.java index 22b27a67..f17e42f4 100644 --- a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsv.java +++ b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsv.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsycho.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsycho.java index f2340849..798a75db 100644 --- a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsycho.java +++ b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsycho.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderRgb.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderRgb.java index 1bcab91a..d1f0411a 100644 --- a/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderRgb.java +++ b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderRgb.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvTest.java b/engine/hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvTest.java index cd279eb8..fd26c8aa 100644 --- a/engine/hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvTest.java +++ b/engine/hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvTest.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/impl/pom.xml b/engine/impl/pom.xml index 3ce85d73..7f702cb0 100644 --- a/engine/impl/pom.xml +++ b/engine/impl/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.3 + 0.8.4 contrast-finder-impl - 0.8.3 + 0.8.4 jar impl diff --git a/engine/impl/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactoryImpl.java b/engine/impl/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactoryImpl.java index e23f2f3c..b431b8a6 100644 --- a/engine/impl/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactoryImpl.java +++ b/engine/impl/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactoryImpl.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaisonImpl.java b/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaisonImpl.java index abec506d..8a173797 100644 --- a/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaisonImpl.java +++ b/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaisonImpl.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/ColorResultImpl.java b/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/ColorResultImpl.java index 4d61fda3..e76e28b8 100644 --- a/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/ColorResultImpl.java +++ b/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/ColorResultImpl.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactoryImpl.java b/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactoryImpl.java index 5e90fbea..e1b86865 100644 --- a/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactoryImpl.java +++ b/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactoryImpl.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactoryImpl.java b/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactoryImpl.java index bb735a90..731a3796 100644 --- a/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactoryImpl.java +++ b/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactoryImpl.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/pom.xml b/engine/pom.xml index 48875b6f..0a8c7447 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.8.3 + 0.8.4 engine - 0.8.3 + 0.8.4 pom contrast-finder-engine diff --git a/engine/utils/pom.xml b/engine/utils/pom.xml index 67479083..2d7bbc23 100644 --- a/engine/utils/pom.xml +++ b/engine/utils/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.3 + 0.8.4 contrast-finder-utils - 0.8.3 + 0.8.4 jar utils diff --git a/engine/utils/src/main/java/org/asqatasun/utils/colorconvertor/ColorConverter.java b/engine/utils/src/main/java/org/asqatasun/utils/colorconvertor/ColorConverter.java index 230f7f67..0418d89b 100644 --- a/engine/utils/src/main/java/org/asqatasun/utils/colorconvertor/ColorConverter.java +++ b/engine/utils/src/main/java/org/asqatasun/utils/colorconvertor/ColorConverter.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/utils/src/main/java/org/asqatasun/utils/colornamelookup/ColorNameLookup.java b/engine/utils/src/main/java/org/asqatasun/utils/colornamelookup/ColorNameLookup.java index eaf98b62..3e13fac3 100644 --- a/engine/utils/src/main/java/org/asqatasun/utils/colornamelookup/ColorNameLookup.java +++ b/engine/utils/src/main/java/org/asqatasun/utils/colornamelookup/ColorNameLookup.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/utils/src/main/java/org/asqatasun/utils/contrastchecker/ContrastChecker.java b/engine/utils/src/main/java/org/asqatasun/utils/contrastchecker/ContrastChecker.java index c96f2246..55ad2c23 100644 --- a/engine/utils/src/main/java/org/asqatasun/utils/contrastchecker/ContrastChecker.java +++ b/engine/utils/src/main/java/org/asqatasun/utils/contrastchecker/ContrastChecker.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/utils/src/main/java/org/asqatasun/utils/distancecalculator/DistanceCalculator.java b/engine/utils/src/main/java/org/asqatasun/utils/distancecalculator/DistanceCalculator.java index 3289818e..977dd697 100644 --- a/engine/utils/src/main/java/org/asqatasun/utils/distancecalculator/DistanceCalculator.java +++ b/engine/utils/src/main/java/org/asqatasun/utils/distancecalculator/DistanceCalculator.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/utils/src/test/java/org/asqatasun/utils/colorconvertor/ColorConverterTest.java b/engine/utils/src/test/java/org/asqatasun/utils/colorconvertor/ColorConverterTest.java index a00dba3d..003205b8 100644 --- a/engine/utils/src/test/java/org/asqatasun/utils/colorconvertor/ColorConverterTest.java +++ b/engine/utils/src/test/java/org/asqatasun/utils/colorconvertor/ColorConverterTest.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/utils/src/test/java/org/asqatasun/utils/colornamelookup/ColorNameLookupTest.java b/engine/utils/src/test/java/org/asqatasun/utils/colornamelookup/ColorNameLookupTest.java index 1e28723e..14cd443c 100644 --- a/engine/utils/src/test/java/org/asqatasun/utils/colornamelookup/ColorNameLookupTest.java +++ b/engine/utils/src/test/java/org/asqatasun/utils/colornamelookup/ColorNameLookupTest.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/utils/src/test/java/org/asqatasun/utils/contrastchecker/ContrastCheckerTest.java b/engine/utils/src/test/java/org/asqatasun/utils/contrastchecker/ContrastCheckerTest.java index 9f560540..64809e17 100644 --- a/engine/utils/src/test/java/org/asqatasun/utils/contrastchecker/ContrastCheckerTest.java +++ b/engine/utils/src/test/java/org/asqatasun/utils/contrastchecker/ContrastCheckerTest.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/engine/utils/src/test/java/org/asqatasun/utils/distancecalculator/DistanceCalculatorTest.java b/engine/utils/src/test/java/org/asqatasun/utils/distancecalculator/DistanceCalculatorTest.java index 8ca5bc2a..dad0fa91 100644 --- a/engine/utils/src/test/java/org/asqatasun/utils/distancecalculator/DistanceCalculatorTest.java +++ b/engine/utils/src/test/java/org/asqatasun/utils/distancecalculator/DistanceCalculatorTest.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/pom.xml b/pom.xml index 1b8dd58b..18469dba 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ 3.7.0 2.20.1 2.9 - 3.0.0-M1 + 3.0.0 2.5 - 2.17 + 3.0.0 3.0.2 - 0.7.9 + 0.8.0 3.1 @@ -233,8 +233,9 @@ + usage: mvn clean install + report: engine/*/target/site/jacoco + no aggregate report (if you know how to do it…) --> org.jacoco jacoco-maven-plugin @@ -255,6 +256,24 @@ + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + html + + + + + @@ -268,6 +287,8 @@ ${maven-project-info-reports-plugin.version} + + - 4.3.13.RELEASE + 4.3.14.RELEASE 4.2.3.RELEASE 1.5.2 1.2.5 @@ -42,12 +42,12 @@ 3.2.0 3.0.2 - 1.0-beta-1 + 2.0.0 1.5.1 - 1.5 + 1.6 - contrast-finder-webapp-${project.version} + contrast-finder-webapp_${project.version} org.apache.maven.plugins @@ -98,11 +98,13 @@ native2ascii-utf8-properties - native2ascii + resources + process-resources UTF8 - src/main/resources + + src/main/resources **/*_utf8*.properties @@ -134,14 +136,14 @@ true - ${project.build.directory}/${project.build.finalName}/Js/_contrast-finder.all.min.js + ${project.build.directory}/${project.build.finalName}/Js/_contrast-finder_${project.version}.all.min.js **/*min.js true - ${project.build.directory}/${project.build.finalName}/Css/_contrast-finder.all.min.css + ${project.build.directory}/${project.build.finalName}/Css/_contrast-finder_${project.version}.all.min.css **/*min.css @@ -161,7 +163,7 @@ src/main/resources/descriptor.xml target - contrast-finder_${project.version}.i386 + contrast-finder-webapp_${project.version} false @@ -175,20 +177,23 @@ + org.vafer jdeb ${jdeb.version} + jdeb_tomcat7 package jdeb - ${project.build.directory}/contrast-finder_${project.version}.deb + ${project.build.directory}/contrast-finder-webapp_${project.version}_tomcat7.deb true - ${project.basedir}/src/deb/control + ${project.basedir}/src/deb/tomcat7/control template @@ -197,20 +202,14 @@ /var/log/contrast-finder - - link - true - /usr/share/tomcat7/lib/spring3-instrument-tomcat.jar - ../../java/spring3-instrument-tomcat.jar - true file ${project.basedir}/src/main/resources/conf/contrast-finder.conf.dist /etc/contrast-finder/contrast-finder.conf.dist - perm - tomcat7 + perm + tomcat7 @@ -224,7 +223,7 @@ file - ${project.build.directory}/contrast-finder-webapp-${project.version}.war + ${project.build.directory}/contrast-finder-webapp_${project.version}.war contrast-finder.war perm @@ -234,7 +233,62 @@ file - ${project.basedir}/src/deb/copyright + ${project.basedir}/src/deb/tomcat7/copyright + /usr/share/doc/contrast-finder-webapp/copyright + + + + + + jdeb_tomcat8 + package + + jdeb + + + ${project.build.directory}/contrast-finder-webapp_${project.version}_tomcat8.deb + true + ${project.basedir}/src/deb/tomcat8/control + + + template + + /etc/contrast-finder + /var/log/contrast-finder + + + + true + file + ${project.basedir}/src/main/resources/conf/contrast-finder.conf.dist + /etc/contrast-finder/contrast-finder.conf.dist + + perm + tomcat8 + + + + file + ${project.basedir}/src/main/resources/conf/contrast-finder.log + + perm + /var/log/contrast-finder + tomcat8 + + + + file + ${project.build.directory}/contrast-finder-webapp_${project.version}.war + contrast-finder.war + + perm + /var/lib/tomcat8/webapps + tomcat8 + + + + file + ${project.basedir}/src/deb/tomcat8/copyright /usr/share/doc/contrast-finder-webapp/copyright diff --git a/webapp/src/deb/README.txt b/webapp/src/deb/README.txt index 82be0e2a..d8069583 100644 --- a/webapp/src/deb/README.txt +++ b/webapp/src/deb/README.txt @@ -1,6 +1,8 @@ +##### Tomcat 7 ########################## + # install contrast-finder-webapp + dependencies - dpkg -i *.deb + dpkg -i contrast-finder-webapp_*_tomcat7.deb apt-get -f install # in your browser @@ -13,17 +15,46 @@ # or # uninstall contrast-finder + dependencies dpkg --purge contrast-finder-webapp - apt-get remove tomcat7 libspring-instrument-java + apt-get remove tomcat7 libspring-instrument-java apt-get autoremove # See package information - dpkg -l contrast-finder-webapp tomcat7 libspring-instrument-java + dpkg -l contrast-finder-webapp tomcat7 libspring-instrument-java # Check directories and files ls -l /var/lib/tomcat7/webapps ls -l /etc/contrast-finder ls -l /var/log/contrast-finder/ - ls -l /usr/share/tomcat7/lib/spring3-instrument-tomcat* + ls -l /usr/share/tomcat7/lib/spring3-instrument-tomcat* + +##### Tomcat 8 ########################### + + # install contrast-finder-webapp + dependencies + dpkg -i contrast-finder-webapp_*_tomcat8.deb + apt-get -f install + + # in your browser + # http://localhost:8080/contrast-finder/ + + + # uninstall contrast-finder + dpkg --purge contrast-finder-webapp + + # or + # uninstall contrast-finder + dependencies + dpkg --purge contrast-finder-webapp + apt-get remove tomcat8 libspring-instrument-java + apt-get autoremove + + + # See package information + dpkg -l contrast-finder-webapp tomcat8 libspring-instrument-java + + # Check directories and files + ls -l /var/lib/tomcat8/webapps + ls -l /etc/contrast-finder + ls -l /var/log/contrast-finder/ + ls -l /usr/share/tomcat8/lib/spring3-instrument-tomcat* diff --git a/webapp/src/deb/control/control b/webapp/src/deb/tomcat7/control/control similarity index 93% rename from webapp/src/deb/control/control rename to webapp/src/deb/tomcat7/control/control index 52c77d48..283ff74b 100644 --- a/webapp/src/deb/control/control +++ b/webapp/src/deb/tomcat7/control/control @@ -6,7 +6,7 @@ Priority: optional Maintainer: contrast-finder.org Architecture: all Build-Depends: debhelper (>=9) -Depends: tomcat7, libspring-instrument-java +Depends: tomcat7 Standards-Version: 3.9.6 Homepage: [[url]] Vcs-Git: git://github.com:Asqatasun/Contrast-Finder.git diff --git a/webapp/src/deb/control/postinst b/webapp/src/deb/tomcat7/control/postinst similarity index 100% rename from webapp/src/deb/control/postinst rename to webapp/src/deb/tomcat7/control/postinst diff --git a/webapp/src/deb/control/postrm b/webapp/src/deb/tomcat7/control/postrm similarity index 100% rename from webapp/src/deb/control/postrm rename to webapp/src/deb/tomcat7/control/postrm diff --git a/webapp/src/deb/control/preinst b/webapp/src/deb/tomcat7/control/preinst similarity index 100% rename from webapp/src/deb/control/preinst rename to webapp/src/deb/tomcat7/control/preinst diff --git a/webapp/src/deb/control/prerm b/webapp/src/deb/tomcat7/control/prerm similarity index 100% rename from webapp/src/deb/control/prerm rename to webapp/src/deb/tomcat7/control/prerm diff --git a/webapp/src/deb/copyright b/webapp/src/deb/tomcat7/copyright similarity index 94% rename from webapp/src/deb/copyright rename to webapp/src/deb/tomcat7/copyright index 6544d7a0..ae9e5fa9 100644 --- a/webapp/src/deb/copyright +++ b/webapp/src/deb/tomcat7/copyright @@ -2,7 +2,7 @@ This package was contrast-finder-webapp by package-debian@contrast-finder.org It was downloaded from https://github.com/Asqatasun/Contrast-Finder/ -Copyright (c) 2008-2017 Contrast-Finder.org +Copyright (c) 2008-2018 Contrast-Finder.org This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as diff --git a/webapp/src/deb/tomcat8/control/control b/webapp/src/deb/tomcat8/control/control new file mode 100644 index 00000000..819b1d4d --- /dev/null +++ b/webapp/src/deb/tomcat8/control/control @@ -0,0 +1,21 @@ +Source: [[name]] +Package: [[name]] +Version: [[version]] +Section: web +Priority: optional +Maintainer: contrast-finder.org +Architecture: all +Build-Depends: debhelper (>=9) +Depends: tomcat8 +Standards-Version: 3.9.6 +Homepage: [[url]] +Vcs-Git: git://github.com:Asqatasun/Contrast-Finder.git +Vcs-Browser: https://github.com/Asqatasun/Contrast-Finder +Description: [[description]] + Contrast-Finder is a tool which computes the contrast between two colors. + . + (background, foreground) and checks if the contrast is valid. When the + . + contrast is not valid, the main target is to suggest some correct colors + . + contrasts. diff --git a/webapp/src/deb/tomcat8/control/postinst b/webapp/src/deb/tomcat8/control/postinst new file mode 100644 index 00000000..6bebab47 --- /dev/null +++ b/webapp/src/deb/tomcat8/control/postinst @@ -0,0 +1,44 @@ +#!/bin/sh +# postinst script for contrast-finder-webapp +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +echo "-----------------------------------" +echo "----> postinst script for contrast-finder-webapp" +case "$1" in + + configure) + echo "----> nothing to do for \`$1'" + echo "" + echo "default URL: " + echo "http://localhost:8080/contrast-finder/" + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + echo "----> nothing to do for \`$1'" + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac +echo "-----------------------------------" + + +exit 0 diff --git a/webapp/src/deb/tomcat8/control/postrm b/webapp/src/deb/tomcat8/control/postrm new file mode 100644 index 00000000..e6c3e974 --- /dev/null +++ b/webapp/src/deb/tomcat8/control/postrm @@ -0,0 +1,40 @@ +#!/bin/sh +# postrm script for contrast-finder-webapp +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +echo "-----------------------------------" +echo "----> postrm script for contrast-finder-webapp" +case "$1" in + purge) + echo "----> nothing to do for \`$1'" + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + echo "----> nothing to do for \`$1'" + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac +echo "-----------------------------------" + + +exit 0 diff --git a/webapp/src/deb/tomcat8/control/preinst b/webapp/src/deb/tomcat8/control/preinst new file mode 100644 index 00000000..498624e7 --- /dev/null +++ b/webapp/src/deb/tomcat8/control/preinst @@ -0,0 +1,35 @@ +#!/bin/sh +# preinst script for contrast-finder-webapp +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +echo "-----------------------------------" +echo "----> preinst script for contrast-finder-webapp" +case "$1" in + install|upgrade) + echo "----> nothing to do for \`$1'" + ;; + + abort-upgrade) + echo "----> nothing to do for \`$1'" + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac +echo "-----------------------------------" + + +exit 0 diff --git a/webapp/src/deb/tomcat8/control/prerm b/webapp/src/deb/tomcat8/control/prerm new file mode 100644 index 00000000..550be282 --- /dev/null +++ b/webapp/src/deb/tomcat8/control/prerm @@ -0,0 +1,38 @@ +#!/bin/sh +# prerm script for contrast-finder-webapp +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +echo "-----------------------------------" +echo "----> prerm script for contrast-finder-webapp" +case "$1" in + remove|upgrade|deconfigure) + echo "----> nothing to do for \`$1'" + ;; + + failed-upgrade) + echo "----> nothing to do for \`$1'" + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac +echo "-----------------------------------" + + +exit 0 diff --git a/webapp/src/deb/tomcat8/copyright b/webapp/src/deb/tomcat8/copyright new file mode 100644 index 00000000..ae9e5fa9 --- /dev/null +++ b/webapp/src/deb/tomcat8/copyright @@ -0,0 +1,18 @@ +This package was contrast-finder-webapp by package-debian@contrast-finder.org + +It was downloaded from https://github.com/Asqatasun/Contrast-Finder/ + +Copyright (c) 2008-2018 Contrast-Finder.org + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . diff --git a/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java index 9835d4bf..99511107 100644 --- a/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java +++ b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/model/ColorModel.java b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/model/ColorModel.java index 7687bbbb..a13ea54b 100644 --- a/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/model/ColorModel.java +++ b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/model/ColorModel.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/validator/ColorModelValidator.java b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/validator/ColorModelValidator.java index c92a7ce5..e7b37f72 100644 --- a/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/validator/ColorModelValidator.java +++ b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/validator/ColorModelValidator.java @@ -1,6 +1,6 @@ /* * Contrast Finder - * Copyright (C) 2008-2017 Asqatasun.org + * Copyright (C) 2008-2018 Asqatasun.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8.properties index ca713fa5..16445cae 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8.properties @@ -4,6 +4,7 @@ NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) home.metaDescription=Contrast-Finder finds correct color contrasts for web accessibility (WCAG). This helps you in satisfying web accessibility (a11y) tests on contrasts. logo.link.title=Back to the homepage +nav.language-switch.aria-label=Languages result.title.colors=colors result.title.foregroundColor=text result.title.backgroundColor=background @@ -37,7 +38,7 @@ form.sampleTitleBold=with words in bold form.sampleText=Here is some text sample form.sampleTextBold=with some words in bold form.sampleText2=\ to illustrate the contrast. -form.sc-info= \ +form.sc-info= \ WCAG \ success criteria 1.4.3 \ \ @@ -128,10 +129,10 @@ home.noResultTxt=

Help

\ defintion of large-scale text from WCAG.

\

All details about the contrast ratio

\ \

Color to edit

\

It is either the foreground or the background. Default is foreground.

\ diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8_en.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8_en.properties index ca713fa5..16445cae 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8_en.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_en.properties @@ -4,6 +4,7 @@ NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) home.metaDescription=Contrast-Finder finds correct color contrasts for web accessibility (WCAG). This helps you in satisfying web accessibility (a11y) tests on contrasts. logo.link.title=Back to the homepage +nav.language-switch.aria-label=Languages result.title.colors=colors result.title.foregroundColor=text result.title.backgroundColor=background @@ -37,7 +38,7 @@ form.sampleTitleBold=with words in bold form.sampleText=Here is some text sample form.sampleTextBold=with some words in bold form.sampleText2=\ to illustrate the contrast. -form.sc-info= \ +form.sc-info= \ WCAG \ success criteria 1.4.3 \ \ @@ -128,10 +129,10 @@ home.noResultTxt=

Help

\ defintion of large-scale text from WCAG.

\

All details about the contrast ratio

\ \

Color to edit

\

It is either the foreground or the background. Default is foreground.

\ diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8_fr.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8_fr.properties index 947b93e7..ade61dfa 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8_fr.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_fr.properties @@ -4,6 +4,7 @@ NOT_A_VALID_RATIO.colorModel.ratio=Le ratio n'est pas valide home.titleTag=Contrast Finder, trouvez le bon contraste pour vos couleurs, accessibilité web (WCAG / RGAA) home.metaDescription=Outil en ligne pour vérifier si le contraste de vos couleurs est accessible. Contrast-Finder propose des jeux de couleurs accessibles proches de celles que vous venez de tester. Accessibilité web (WCAG / RGAA) logo.link.title=Retour à la page d'accueil +nav.language-switch.aria-label=Langues result.title.colors=couleurs result.title.foregroundColor=texte result.title.backgroundColor=fond @@ -37,7 +38,7 @@ form.sampleTitleBold=avec des mots en gras form.sampleText=Ceci est un échantillon de texte form.sampleTextBold=avec quelques mots en gras form.sampleText2=\ pour illustrer le bon contraste. -form.sc-info=Le \ +form.sc-info=Le \ critère de succès 1.4.3 \ du WCAG \ \ @@ -74,7 +75,7 @@ home.noResultTxt=

Aide

\

\

Couleur par mots-clés

\

Exemple : Black, Silver, YellowGreen, MediumPurple.
\ -Les valeurs autorisées sont les noms des couleurs utilisables en CSS \ +Les valeurs autorisées sont les noms des couleurs utilisables en CSS \ (du niveau CSS 1 au niveau CSS 4). \

\

Couleur en hexadécimal

\ @@ -126,7 +127,7 @@ Les valeurs autorisées sont les définition de texte agrandi du WCAG. \ + définition de texte agrandi du WCAG. \

\

Informations complémentaires sur le contraste pour l'accessibilité

\

\ @@ -143,11 +144,11 @@ Les valeurs autorisées sont les WCAG 2.0 success criteria 1.4.3 (Level AA)\ -

  • WCAG 2.0 success criteria 1.4.6 (Level AAA)
    • \ -
  • WCAG 2.0 Glossary - Contrast Ratio
    • \ -
  • WCAG 2.0 - MathML version of the relative luminance definition
    • \ -
  • WCAG 2.0 - Defintion of large-scale text
    • \ +
  • WCAG 2.0 success criteria 1.4.3 (Level AA)
    • \ +
  • WCAG 2.0 success criteria 1.4.6 (Level AAA)
    • \ +
  • WCAG 2.0 Glossary - Contrast Ratio
    • \ +
  • WCAG 2.0 - MathML version of the relative luminance definition
    • \ +
  • WCAG 2.0 - Defintion of large-scale text
    • \ \ \ \ @@ -182,7 +183,7 @@ Les valeurs autorisées sont les code source \ + code source \ ou à en discuter sur le forum.

    ######### unused i18n entries # form.results=Resultats diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8_ko.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8_ko.properties index fc9d0cc8..690ccad8 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8_ko.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_ko.properties @@ -4,6 +4,7 @@ NOT_A_VALID_RATIO.colorModel.ratio=올바르지 않은 비율 home.titleTag=Contrast Finder, 웹 접근성 기준(WCAG)에 적합한 충분히 대비되는 색의 조합 검색 home.metaDescription=Contrast-Finder는 웹 접근성 기준(WCAG)에 적합한 충분히 대비되는 색의 조합을 찾아줍니다. 그래서 색의 대비와 관련된 웹 접근성(a11y) 테스트를 충족시키는 데 도움을 드립니다. logo.link.title=홈페이지로 되돌아 가기 +nav.language-switch.aria-label=언어 result.title.colors=대비 색 result.title.foregroundColor=본문 글자 result.title.backgroundColor=배경 @@ -37,13 +38,13 @@ form.sampleTitleBold=크고 좀 더 굵은 글자 form.sampleText=여기엔 약간의 예시 글과 함께 form.sampleTextBold=더 굵은 글자가 함께 표시되면서 form.sampleText2=\ 색의 대비 정도를 확인하실 수 있습니다. -form.sc-info= \ +form.sc-info= \ WCAG \ 통과 기준 1.4.3 \ 에 의하면 \ 글자는 최소 4.5 (큰 글자의 경우 3) \ 이상의 대비 비율을 가지고 있어야 합니다. -footer.LikedCf=Contrast-Finder가 마음에 드셨나요?
    Asqatasun도 방문해 보세요. 웹 접근성을 고려한 오픈소스 웹 사이트 분석 도구입니다. +footer.LikedCf=Contrast-Finder가 마음에 드셨나요?
    Asqatasun도 방문해 보세요. 웹 접근성을 고려한 오픈소스 웹 사이트 분석 도구입니다. form.contrastSolutionDistance=편차 form.contrastSolutionDistanceEx=처음 지정한 색과의 편차 form.objectifs=검색 범위 @@ -75,7 +76,7 @@ home.noResultTxt=

    도움말

    \

    컬러 키워드

    \

    보기: Black, Silver, YellowGreen, MediumPurple.
    \ 여기에 사용될 수 있는 값은 \ - CSS 컬러 키워드 문서에 나열되어 있습니다. \ + CSS 컬러 키워드 문서에 나열되어 있습니다. \ (CSS level 1부터 CSS level 4까지). \

    \

    16진법 형태의 컬러 값

    \ @@ -125,13 +126,13 @@ home.noResultTxt=

    도움말

    \ 150% 혹은 1.5em 크기와 같은 것으로 칩니다. \ \

    글자 크기를 해석하는 방식에 관해서 더 깊고 자세히 알고 싶으시면, \ - WCAG에 기술된 large-scale text의 정의를 읽어보십시오.

    \ + WCAG에 기술된 large-scale text의 정의를 읽어보십시오.

    \

    대비 비율에 관한 자세한 설명

    \ \

    교정하려는 색

    \

    본문 글자 색 또는 배경색을 선택하실 수 있습니다. 기본은 본문 글자 색.

    \ @@ -164,7 +165,7 @@ home.noResultTxt=

    도움말

    \ 어떠한 제안이든 모두 환영합니다! \ 번역, 문제 수정, 오류 보고, 새로운 기능…
    \ 부담없이 \ - 소스 코드를 가지고 놀아보시고, \ + 소스 코드를 가지고 놀아보시고, \ 포럼에서도 상의해 보세요. \

    ######### unused i18n entries diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8_pt.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8_pt.properties index e2546dc1..43f238b5 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8_pt.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_pt.properties @@ -6,14 +6,15 @@ home.metaDescription=Ferramenta on-line para verificar se o contraste das cores Contrast-Finder oferece esquemas de cores disponíveis perto daquelas que acabaste de testar. \ Acessibilidade dos sítios Web (WCAG). logo.link.title=Voltar à pàgina inicial +nav.language-switch.aria-label=línguas result.title.colors=cores result.title.foregroundColor=texto result.title.backgroundColor=fundo result.title.minRation=rácio minimo form.fillInFields=@@@TODO Please fill in the following fields : -form.description=Contrast-Finder encontra os bons contrastes para a acessibilidade web. +form.description=Contrast-Finder encontra os bons contrastes para a acessibilidade web. form.help=Cor em hexadecimal, RGB \ - ou com palavras-chave de cores. \ + ou com palavras-chave de cores. \
    Exemplo : #FFFFFF, rgb(255,255,255) ou white form.foregroundColor=Cor do texto form.backgroundColor=Cor de fundo @@ -40,13 +41,13 @@ form.sampleTitleBold=com palavras em negrito form.sampleText=Este é um texto de exemplo form.sampleTextBold= com algumas palavras em negrito form.sampleText2= para ilustrar o contraste correto. -form.sc-info=O \ +form.sc-info=O \ critèrio de sucesso 1.4.3 \ das WCAG \ \ requer para o texto un rácio de contraste mínimo de 4.5 para fontes normais (e 3 para fontes largas). -footer.LikedCf=Gostas do Contrast-Finder? Experimenta Asqatasun,
    \ - software livre para medir a acessibilidade +footer.LikedCf=Gostas do Contrast-Finder? Experimenta Asqatasun,
    \ + software livre para medir a acessibilidade form.contrastSolutionDistance=Distância form.contrastSolutionDistanceEx=Distância da cor original form.objectifs=Faz uma proposta diff --git a/webapp/src/main/webapp/.well-known/security.txt b/webapp/src/main/webapp/.well-known/security.txt new file mode 100644 index 00000000..f438f38a --- /dev/null +++ b/webapp/src/main/webapp/.well-known/security.txt @@ -0,0 +1,15 @@ +####################################################### +# If you would like to report a security issue +# you may report it to us on Github. +####################################################### +Contact: https://github.com/Asqatasun/Contrast-Finder/issues/ +Contact: https://twitter.com/Contrast_Finder + + +####################################################### +# security.txt is currently an Internet draft +# that has been submitted for RFC review. +# https://securitytxt.org/ +# https://github.com/securitytxt/security-txt +# https://tools.ietf.org/html/draft-foudil-securitytxt +###################################################### diff --git a/webapp/src/main/webapp/Css/30-contrast-finder.css b/webapp/src/main/webapp/Css/30-contrast-finder.css index b5f14902..57e3eaeb 100644 --- a/webapp/src/main/webapp/Css/30-contrast-finder.css +++ b/webapp/src/main/webapp/Css/30-contrast-finder.css @@ -48,11 +48,8 @@ code { /* font-family: Monaco,Menlo,Consolas,"Courier New",monospace; */ } -#lang-switcher { - text-align: right; - position:relative; - top: -2em; -} + + .noResult { text-align: center; @@ -73,29 +70,6 @@ code { font-size: 20px; } -.logo { - float: right; - width: 10%; - padding: 5px; - position: absolute; -} - -#contrast-finder-logo { - float: left; - width: 150px; - height: 150px; - margin-right: 15px; - margin-top: -35px; -} - - #contrast-finder-logo a:hover { - opacity: .75; - } - #contrast-finder-logo img { - width: 100%; - height: 100%; - border:0; - } #initial-contrast { margin-bottom: 3px; @@ -274,14 +248,55 @@ footer { } /* header template */ +.page-header { + margin-top: 0; +} #header_title h1 { margin-top: 0; letter-spacing: 0.15em; } #header_title { margin-left: 13.5em; + margin-top: 2em; } +#lang-switcher { + text-align: right; + position:relative; + top: 0.5em; +} + #lang-switcher ul { + list-style-type: none; + } + #lang-switcher li { + display: inline-block; + margin-right: 0.6em; + } + + +.logo { + float: right; + width: 10%; + padding: 5px; + position: absolute; +} + +#contrast-finder-logo { + float: left; + width: 150px; + height: 150px; + margin-right: 15px; + margin-top: -20px; +} + + #contrast-finder-logo a:hover { + opacity: .75; + } + #contrast-finder-logo img { + width: 100%; + height: 100%; + border:0; + } /* Color picker */ diff --git a/webapp/src/main/webapp/Images/logo/favicon/manifest.json b/webapp/src/main/webapp/Images/logo/favicon/manifest.json deleted file mode 100644 index 6555aca9..00000000 --- a/webapp/src/main/webapp/Images/logo/favicon/manifest.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "Contrast Finder", - "icons": [ - { - "src": "\/Images\/logo\/favicon\/android-chrome-36x36.png?v=E6bNL5M5Mb", - "sizes": "36x36", - "type": "image\/png" - }, - { - "src": "\/Images\/logo\/favicon\/android-chrome-48x48.png?v=E6bNL5M5Mb", - "sizes": "48x48", - "type": "image\/png" - }, - { - "src": "\/Images\/logo\/favicon\/android-chrome-72x72.png?v=E6bNL5M5Mb", - "sizes": "72x72", - "type": "image\/png" - }, - { - "src": "\/Images\/logo\/favicon\/android-chrome-96x96.png?v=E6bNL5M5Mb", - "sizes": "96x96", - "type": "image\/png" - }, - { - "src": "\/Images\/logo\/favicon\/android-chrome-144x144.png?v=E6bNL5M5Mb", - "sizes": "144x144", - "type": "image\/png" - }, - { - "src": "\/Images\/logo\/favicon\/android-chrome-192x192.png?v=E6bNL5M5Mb", - "sizes": "192x192", - "type": "image\/png" - }, - { - "src": "\/Images\/logo\/favicon\/android-chrome-256x256.png?v=E6bNL5M5Mb", - "sizes": "256x256", - "type": "image\/png" - }, - { - "src": "\/Images\/logo\/favicon\/android-chrome-384x384.png?v=E6bNL5M5Mb", - "sizes": "384x384", - "type": "image\/png" - }, - { - "src": "\/Images\/logo\/favicon\/android-chrome-512x512.png?v=E6bNL5M5Mb", - "sizes": "512x512", - "type": "image\/png" - } - ], - "theme_color": "#ffffff", - "start_url": "https:\/\/app.contrast-finder.org\/", - "display": "standalone" -} diff --git a/webapp/src/main/webapp/Images/logo/favicon/manifest.webmanifest b/webapp/src/main/webapp/Images/logo/favicon/manifest.webmanifest new file mode 100644 index 00000000..28ef9548 --- /dev/null +++ b/webapp/src/main/webapp/Images/logo/favicon/manifest.webmanifest @@ -0,0 +1,57 @@ +{ + "name" : "Contrast Finder", + "short_name" : "FindContrast", + "description" : "Contrast-Finder finds correct color contrasts for web accessibility", + "start_url" : "/", + "display" : "browser", + "orientation" : "any", + "background_color" : "#FFFFFF", + "theme_color" : "#D6131C", + "icons": [ + { + "src": "/Images/logo/favicon/android-chrome-36x36.png?v=E6bNL5M5Mb", + "sizes": "36x36", + "type": "image/png" + }, + { + "src": "/Images/logo/favicon/android-chrome-48x48.png?v=E6bNL5M5Mb", + "sizes": "48x48", + "type": "image/png" + }, + { + "src": "/Images/logo/favicon/android-chrome-72x72.png?v=E6bNL5M5Mb", + "sizes": "72x72", + "type": "image/png" + }, + { + "src": "/Images/logo/favicon/android-chrome-96x96.png?v=E6bNL5M5Mb", + "sizes": "96x96", + "type": "image/png" + }, + { + "src": "/Images/logo/favicon/android-chrome-144x144.png?v=E6bNL5M5Mb", + "sizes": "144x144", + "type": "image/png" + }, + { + "src": "/Images/logo/favicon/android-chrome-192x192.png?v=E6bNL5M5Mb", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/Images/logo/favicon/android-chrome-256x256.png?v=E6bNL5M5Mb", + "sizes": "256x256", + "type": "image/png" + }, + { + "src": "/Images/logo/favicon/android-chrome-384x384.png?v=E6bNL5M5Mb", + "sizes": "384x384", + "type": "image/png" + }, + { + "src": "/Images/logo/favicon/android-chrome-512x512.png?v=E6bNL5M5Mb", + "sizes": "512x512", + "type": "image/png" + } + ] +} diff --git a/webapp/src/main/webapp/META-INF/context.xml b/webapp/src/main/webapp/META-INF/context.xml index 705a416e..d47cd68f 100644 --- a/webapp/src/main/webapp/META-INF/context.xml +++ b/webapp/src/main/webapp/META-INF/context.xml @@ -1,4 +1,4 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/webapp/src/main/webapp/WEB-INF/pages/form.jsp b/webapp/src/main/webapp/WEB-INF/pages/form.jsp index 0a8abdce..befa7483 100644 --- a/webapp/src/main/webapp/WEB-INF/pages/form.jsp +++ b/webapp/src/main/webapp/WEB-INF/pages/form.jsp @@ -443,7 +443,7 @@ <%@include file='/WEB-INF/template/footer.jspf' %> - + " > @@ -54,5 +55,4 @@ " /> " /> - \ 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 a0eafd42..4a5efc4f 100644 --- a/webapp/src/main/webapp/WEB-INF/template/header.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/header.jspf @@ -46,42 +46,41 @@ -