diff --git a/.editorconfig b/.editorconfig index 2b36f501..c6994f77 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,9 +12,8 @@ root = true # + 4 space indentation ############################################## [*] +insert_final_newline = true end_of_line = lf indent_style = space indent_size = 4 charset = utf-8 - - diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d19c14f..57eabf35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # CHANGELOG +Contrast-Finder 0.9.1, 2018-05-13 +--------------------------------- + +Upgrade-o-meter: just replace the .war file and restart Tomcat + +Thanks to: +- @davidjr82 - PR #158 + +### Security +- [#152 - Upgraded SpringFramework (4.3.17 instead of 4.3.16)](https://github.com/Asqatasun/Contrast-Finder/issues/152) +- [#160 - Upgraded spring--security (4.2.6 instead of 4.2.5)](https://github.com/Asqatasun/Contrast-Finder/issues/160) + +### Improvement +- [#158 - Update Spanish i18n file and title attribute in language menu](https://github.com/Asqatasun/Contrast-Finder/issues/158) + +### Configuration +- [#159 - Changed default docker image: ubuntu-18.04_tomcat-8.5 instead of ubuntu-16.04_tomcat-7](https://github.com/Asqatasun/Contrast-Finder/issues/159) + +### Task +- Delete old DockerFiles + + Contrast-Finder 0.9.0, 2018-04-24 --------------------------------- diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 6137977b..9e52b4b4 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -68,14 +68,15 @@ members of the project's leadership. ## Attribution This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at [http://contributor-covenant.org/version/1/4][version] +available at [https://contributor-covenant.org/version/1/4][version] -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ +[homepage]: https://contributor-covenant.org +[version]: https://contributor-covenant.org/version/1/4/ ## Translations -* [Español](http://contributor-covenant.org/version/1/4/es/) -* [Français](http://contributor-covenant.org/version/1/4/fr/) +* [Español](https://contributor-covenant.org/version/1/4/es/) +* [Français](https://contributor-covenant.org/version/1/4/fr/) + +[All available translations](https://contributor-covenant.org/i18n/) -[All available translations](http://contributor-covenant.org/i18n/) \ No newline at end of file diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile index c59b0530..fb5a2fa9 120000 --- a/docker/RELEASE/Dockerfile +++ b/docker/RELEASE/Dockerfile @@ -1 +1 @@ -ubuntu-16.04_tomcat-7/Dockerfile \ No newline at end of file +ubuntu-18.04_tomcat-8.5/Dockerfile \ No newline at end of file diff --git a/docker/RELEASE/README.md b/docker/RELEASE/README.md index 6796aaad..d81588b0 100644 --- a/docker/RELEASE/README.md +++ b/docker/RELEASE/README.md @@ -9,13 +9,14 @@ Supported tags and respective `Dockerfile` links : ### 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_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) * [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.9.0, ubuntu-16.04](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile) -* [alpine, v0.9.0_alpine, alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/alpine_tomcat-8.5/Dockerfile) -* [v0.8.6](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.6/docker/RELEASE/Dockerfile), [v0.8.5](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.5/docker/RELEASE/Dockerfile), [v0.8.4](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.4/docker/RELEASE/Dockerfile), [v0.8.3](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.3/docker/RELEASE/Dockerfile), [v0.8.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.2/docker/RELEASE/Dockerfile), [v0.8.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.1/docker/RELEASE/Dockerfile), [v0.8.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.0/docker/RELEASE/Dockerfile) +* [latest, v0.9.1, ubuntu-18.04](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile) +* [alpine, v0.9.1_alpine, alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/alpine_tomcat-8.5/Dockerfile) +* [v0.9.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.0/docker/RELEASE/Dockerfile), [v0.8.6](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.6/docker/RELEASE/Dockerfile), [v0.8.5](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.5/docker/RELEASE/Dockerfile), [v0.8.4](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.4/docker/RELEASE/Dockerfile), [v0.8.3](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.3/docker/RELEASE/Dockerfile), [v0.8.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.2/docker/RELEASE/Dockerfile), [v0.8.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.1/docker/RELEASE/Dockerfile), [v0.8.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.0/docker/RELEASE/Dockerfile) * [v0.7.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.7.0/docker/RELEASE/Dockerfile), [v0.6.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.6.0/docker/RELEASE/Dockerfile), [v0.5.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.2/docker/RELEASE/Dockerfile) ## How to use this image diff --git a/docker/RELEASE/alpine_tomcat-7/Dockerfile b/docker/RELEASE/alpine_tomcat-7/Dockerfile index 5b89ac67..bede10a3 100644 --- a/docker/RELEASE/alpine_tomcat-7/Dockerfile +++ b/docker/RELEASE/alpine_tomcat-7/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp (tomcat7 < jdk7 < alpine 3.7)" \ - org.label-schema.version = "0.9.0" \ + org.label-schema.version = "0.9.1" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder:alpine" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.0 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/contrast-finder-webapp_0.9.0.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/contrast-finder-webapp_0.9.1.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -39,7 +39,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.9.0" +ARG CONTRAST_FINDER_RELEASE="0.9.1" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" diff --git a/docker/RELEASE/alpine_tomcat-8.5/Dockerfile b/docker/RELEASE/alpine_tomcat-8.5/Dockerfile index 92948a19..453ff9d0 100644 --- a/docker/RELEASE/alpine_tomcat-8.5/Dockerfile +++ b/docker/RELEASE/alpine_tomcat-8.5/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-8.5 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp (tomcat 8.5 < jdk 8 < alpine 3.7)" \ - org.label-schema.version = "0.9.0" \ + org.label-schema.version = "0.9.1" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder:alpine" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.0 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/contrast-finder-webapp_0.9.0.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/contrast-finder-webapp_0.9.1.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -39,7 +39,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.9.0" +ARG CONTRAST_FINDER_RELEASE="0.9.1" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" diff --git a/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile b/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile index 5432cad9..6c8fa014 100644 --- a/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile +++ b/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp (Ubuntu 14.04 - Tomcat 7)" \ - org.label-schema.version = "0.9.0" \ + org.label-schema.version = "0.9.1" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.0 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/contrast-finder-webapp_0.9.0.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/contrast-finder-webapp_0.9.1.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -37,7 +37,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.9.0" +ARG CONTRAST_FINDER_RELEASE="0.9.1" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" diff --git a/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile b/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile index 4ec27beb..306e0eca 100644 --- a/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile +++ b/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp (Ubuntu 16.04 - Tomcat 7)" \ - org.label-schema.version = "0.9.0" \ + org.label-schema.version = "0.9.1" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.0 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/contrast-finder-webapp_0.9.0.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.1 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/contrast-finder-webapp_0.9.1.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -37,7 +37,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.9.0" +ARG CONTRAST_FINDER_RELEASE="0.9.1" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" diff --git a/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile b/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile new file mode 100644 index 00000000..744ee7f2 --- /dev/null +++ b/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile @@ -0,0 +1,71 @@ +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 +LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ + org.label-schema.name = "Contrast-Finder - WebApp (Ubuntu 18.04 - Tomcat 8.5, Java 10)" \ + org.label-schema.version = "0.9.1" \ + 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.9.1 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/contrast-finder-webapp_0.9.1.tar.gz . +# +# --- Launch a container +# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder +# +# --- 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-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 +################################################################### + +# build variables +ARG CONTRAST_FINDER_RELEASE="0.9.1" +ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" +ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" + +# 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/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" + +# 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-18.04_tomcat-8.5 + +CMD service tomcat8 start ; \ + tail -f -n 50 ${TOMCAT_LOG} \ + ${LOG_FILE} + diff --git a/docker/RELEASE/ubuntu-18.04_tomcat-8.5/README.md b/docker/RELEASE/ubuntu-18.04_tomcat-8.5/README.md new file mode 120000 index 00000000..32d46ee8 --- /dev/null +++ b/docker/RELEASE/ubuntu-18.04_tomcat-8.5/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 index fb2cd11e..8544b3dc 120000 --- a/docker/SNAPSHOT-local/Dockerfile +++ b/docker/SNAPSHOT-local/Dockerfile @@ -1 +1 @@ -distrib/ubuntu-16.04_tomcat-7/Dockerfile \ No newline at end of file +distrib/ubuntu-18.04_tomcat-8.5/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 index 0044394f..10c0644b 100644 --- a/docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile @@ -21,7 +21,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile b/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile index 6a1fa0ac..574d5885 100644 --- a/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile @@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-8.5 # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile b/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile index 2fcb6f10..7608e3fd 100644 --- a/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile @@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-9 # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile b/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile index fa91237d..56d6000b 100644 --- a/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Debian-9_tomcat-8.5 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile b/docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile index c41b9dc2..559ed96c 100644 --- a/docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile @@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Debian_tomcat-9_jre9 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" ENV CONF_ENV="debug" # Add contrast-finder .war diff --git a/docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile b/docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile index d60fa6fb..5ac6da55 100644 --- a/docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile index 16574099..7403de11 100644 --- a/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile index cc65c285..41ddbd89 100644 --- a/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-8.0 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile b/docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile index 605d0fcc..9b6a2ba8 100644 --- a/docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile @@ -20,7 +20,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile b/docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile index b9fbd351..63bcfa91 100644 --- a/docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile @@ -1,4 +1,4 @@ -FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 # #### usage ###################################################### # @@ -14,12 +14,12 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 # 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:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +# 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.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root @@ -27,7 +27,7 @@ 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 && \ + mv -v contrast-*.war /var/lib/tomcat8/webapps && \ rm -rf /root/contrast-* && \ rm -v ${CONF_FILE} && \ echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ @@ -41,9 +41,9 @@ echo "no file" >> ${INFO_FILE} && \ # Health Check of the Docker Container -# ----> see asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 +# ----> see asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 -CMD service tomcat7 start ; \ +CMD service tomcat8 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 index 650d2b56..3a951f7a 100644 --- a/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile @@ -1,4 +1,4 @@ -FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 # #### usage ###################################################### # @@ -14,12 +14,12 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 # 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:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +# 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.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="HSV" @@ -31,7 +31,7 @@ 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 && \ + mv -v contrast-*.war /var/lib/tomcat8/webapps && \ rm -rf /root/contrast-* && \ echo "default_algorithm=${CONF_DEFAULT_ALGO}" >> ${CONF_FILE} && \ echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ @@ -44,8 +44,8 @@ echo "default_algorithm=${CONF_DEFAULT_ALGO}" >> ${CONF_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 +# ----> see asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 -CMD service tomcat7 start ; \ +CMD service tomcat8 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 index 9de5781c..745cecc3 100644 --- a/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile @@ -1,4 +1,4 @@ -FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 # #### usage ###################################################### # @@ -14,12 +14,12 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 # 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:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +# 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.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" ENV CONF_ENV="debug" # Add contrast-finder .war @@ -28,7 +28,7 @@ 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 && \ + mv -v contrast-*.war /var/lib/tomcat8/webapps && \ rm -rf /root/contrast-* && \ echo "env=${CONF_ENV}" >> ${CONF_FILE} && \ echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ @@ -41,8 +41,8 @@ echo "env=${CONF_ENV}" >> ${CONF_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 +# ----> see asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 -CMD service tomcat7 start ; \ +CMD service tomcat8 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 index 951048e8..ac91c3c3 100644 --- a/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile @@ -1,4 +1,4 @@ -FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 # #### usage ###################################################### # @@ -14,12 +14,12 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 # 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:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +# 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.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" ENV PIWIK_KEY="9" ENV PIWIK_URL="http://localhost/piwik/" @@ -29,7 +29,7 @@ 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 && \ + mv -v contrast-*.war /var/lib/tomcat8/webapps && \ rm -rf /root/contrast-* && \ echo "piwik_analytics_key=${PIWIK_KEY}" >> ${CONF_FILE} && \ echo "piwik_analytics_server=${PIWIK_URL}" >> ${CONF_FILE} && \ @@ -43,9 +43,9 @@ echo "piwik_analytics_server=${PIWIK_URL}" >> ${CONF_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 +# ----> see asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 -CMD service tomcat7 start ; \ +CMD service tomcat8 start ; \ tail -f -n 50 ${TOMCAT_LOG} \ ${LOG_FILE} diff --git a/docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile b/docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile index 7d323701..fec339ae 100644 --- a/docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile @@ -1,4 +1,4 @@ -FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 +FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 # #### usage ###################################################### # @@ -14,12 +14,12 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 # 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:16.04 https://github.com/tianon/docker-brew-ubuntu-core/blob/dist-amd64/xenial/Dockerfile +# 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.9.0" +ENV CONTRAST_FINDER_RELEASE="0.9.1" ENV SEARCH_ENGINGE="yes" # Add contrast-finder .war @@ -28,7 +28,7 @@ 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 && \ + mv -v contrast-*.war /var/lib/tomcat8/webapps && \ rm -rf /root/contrast-* && \ echo "searchEngineInclude=${SEARCH_ENGINGE}" >> ${CONF_FILE} && \ echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ @@ -41,9 +41,9 @@ echo "searchEngineInclude=${SEARCH_ENGINGE}" >> ${CONF_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 +# ----> see asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 -CMD service tomcat7 start ; \ +CMD service tomcat8 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 deleted file mode 100644 index 9ec1ba0c..00000000 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/README.txt +++ /dev/null @@ -1,74 +0,0 @@ - - ------ 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 deleted file mode 100644 index c295dbba..00000000 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_14.04_tomcat7_full/Dockerfile +++ /dev/null @@ -1,110 +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 (Ubuntu 14.04 - Tomcat 7)" \ - org.label-schema.url = "https://contrast-finder.org" \ - org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.0" - # ----> 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.9.0" - -# 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 deleted file mode 100644 index 7167391f..00000000 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat7_full/Dockerfile +++ /dev/null @@ -1,110 +0,0 @@ -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.9.0" - # ----> 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.9.0" - -# 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 deleted file mode 100644 index e06d3fc3..00000000 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat8_full/Dockerfile +++ /dev/null @@ -1,110 +0,0 @@ -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.9.0" - # ----> 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.9.0" - -# 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 deleted file mode 100644 index ebaad7ca..00000000 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_18.04_tomcat8_full/Dockerfile +++ /dev/null @@ -1,110 +0,0 @@ -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.9.0" - # ----> 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.9.0" - -# 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 deleted file mode 100644 index 58a480d5..00000000 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/README.txt +++ /dev/null @@ -1,90 +0,0 @@ - ------ 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/README_v1.txt b/docker/SNAPSHOT-local/test_tomcat-7-8/README_v1.txt deleted file mode 100644 index 4b8945c7..00000000 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/README_v1.txt +++ /dev/null @@ -1,48 +0,0 @@ ----- avant suppression libspring-instrument-java --------------------------------- - - v0.8.3 150 MB - v0.8.2 146 MB -pre-requisites_Alpine_tomcat-7 80 MB ---> 76 MB -pre-requisites_Ubuntu-16.04 115 MB ---> 107 MB -pre-requisites_Ubuntu-14.04 141 MB ---> 138 MB -pre-requisites_from-Ubuntu 141 MB ---> 138 MB -------------------------------------- - - - - - - - test: - - Build-Jdk: 1.8 @@@ IN PROGRESSS - - Build-Jdk: 1.7 @@@ TODO - check log @@@ TODO - - -Build-Jdk: 1.8.0_151 ----------------------------------------------- - -Docker ubuntu:14.04 Tomcat 7 - ----> libspring-instrument-java not needed - -Docker ubuntu:16.04 Tomcat 7 - ----> libspring-instrument-java not needed - -Docker ubuntu:18.04 Tomcat 8.5 (next Ubuntu LTS) - ----> libspring-instrument-java not needed - - -Build-Jdk: 1.7.0_151 ----------------------------------------------- - -Docker ubuntu:14.04 Tomcat 7 - ----> libspring-instrument-java not needed - -Docker ubuntu:16.04 Tomcat 7 - ----> libspring-instrument-java not needed - -Docker ubuntu:16.04 Tomcat 8.0 - -v2---> libspring-instrument-java declared in context.xml - -Docker ubuntu:18.04 Tomcat 8.5 (next Ubuntu LTS) - ----> libspring-instrument-java not needed diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full/Dockerfile deleted file mode 100644 index a6e70744..00000000 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full/Dockerfile +++ /dev/null @@ -1,107 +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 (Ubuntu 14.04 - Tomcat 7)" \ - org.label-schema.url = "https://contrast-finder.org" \ - org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.0" - # ----> 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.9.0" - -# 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 deleted file mode 100644 index 177d1927..00000000 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat7_full/Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -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.9.0" - # ----> 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.9.0" - -# 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 deleted file mode 100644 index 523841b5..00000000 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat8_full/Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -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.9.0" - # ----> 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.9.0" - -# 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 deleted file mode 100644 index 0f7a40c9..00000000 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_18.04_tomcat8_full/Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -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.9.0" - # ----> 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.9.0" - -# 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/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile b/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile index c97328ba..96849801 100644 --- a/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (tomcat7 < jdk7 < alpine 3.7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.0" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile b/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile index cc3b05f8..09766e60 100644 --- a/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (tomcat 8.5 < jdk 8 < alpine 3.7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.0" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile b/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile index 34ce1c57..f59412b6 100644 --- a/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile @@ -4,7 +4,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (tomcat 9 < jdk 8 < alpine 3.7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.0" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile b/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile index bc3cca13..858d2070 100644 --- a/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Debian 9 - Tomcat 8.5)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.0" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Debian_tomcat-9_jre9/Dockerfile b/docker/pre-requisites/pre-requisites_Debian_tomcat-9_jre9/Dockerfile index 898a7155..1fb374b9 100644 --- a/docker/pre-requisites/pre-requisites_Debian_tomcat-9_jre9/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Debian_tomcat-9_jre9/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (tomcat 9 < jdk 9 < debian SID)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.0" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile b/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile index 416a0795..cda7510e 100644 --- a/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 14.04 - Tomcat 7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.0" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile index 92582d03..80907ce8 100644 --- a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 16.04 - Tomcat 7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.0" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile index c9ff0f93..e2ffd17c 100644 --- a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 16.04 - Tomcat 8.0)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.9.0" + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile b/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile index 66313b36..a8e67cc7 100644 --- a/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile @@ -1,9 +1,9 @@ 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.9.0" +LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ + org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 18.04 - Tomcat 8.5, Java 10)" \ + org.label-schema.url = "https://contrast-finder.org" \ + org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ + org.label-schema.version = "0.9.1" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/documentation/badge.md b/documentation/badge.md index 4f59ca0b..82d36483 100644 --- a/documentation/badge.md +++ b/documentation/badge.md @@ -20,6 +20,9 @@ [![GitHub issues](https://img.shields.io/github/issues/asqatasun/contrast-finder.svg?style=flat-square)](https://github.com/Asqatasun/Contrast-Finder/issues) [![GitHub closed issues](https://img.shields.io/github/issues-closed/asqatasun/contrast-finder.svg?style=flat-square)](https://github.com/Asqatasun/Contrast-Finder/issues?q=is%3Aissue+is%3Aclosed) +## Commits +[![Commits](https://img.shields.io/github/commit-activity/y/asqatasun/contrast-finder.svg)](https://github.com/Asqatasun/Contrast-Finder/commits/develop) + ## Average time to resolve an issue / PR [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/asqatasun/contrast-finder.svg)](http://isitmaintained.com/project/asqatasun/contrast-finder "Average time to resolve an issue") @@ -52,5 +55,8 @@ Some issues are ignored based on their labels (example of ignored labels: "enhan ## Code of Conduct [![Code of Conduct](https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square)](https://github.com/Asqatasun/Contrast-Finder/blob/develop/CODE_OF_CONDUCT.md) +## GitHub contributors +[![GitHub contributors](https://img.shields.io/github/contributors/asqatasun/contrast-finder.svg)](https://github.com/Asqatasun/Contrast-Finder/graphs/contributors) + --- -http://shields.io/ \ No newline at end of file +http://shields.io/ diff --git a/documentation/en/10_Install_doc/webapp_Installation.md b/documentation/en/10_Install_doc/webapp_Installation.md index 451ddefc..e61e6be2 100644 --- a/documentation/en/10_Install_doc/webapp_Installation.md +++ b/documentation/en/10_Install_doc/webapp_Installation.md @@ -14,7 +14,7 @@ You just need to replace `tomcat7` with `tomcat8` in the following command lines ```bash cd /tmp -wget https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/contrast-finder-webapp_0.9.0.tar.gz +wget https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/contrast-finder-webapp_0.9.1.tar.gz tar -xzvf contrast-finder-webapp_*.tar.gz cd contrast-finder-webapp_*/ mv -v install/contrast-finder-webapp_*.war contrast-finder.war diff --git a/documentation/en/30_Contributor_doc/QA-tools.md b/documentation/en/30_Contributor_doc/QA-tools.md index 13455f90..5798c7dd 100644 --- a/documentation/en/30_Contributor_doc/QA-tools.md +++ b/documentation/en/30_Contributor_doc/QA-tools.md @@ -72,6 +72,14 @@ ## Audit history +### 0.9.0 +* Web perf + * https://www.webpagetest.org/result/180513_JQ_6968f5fe020e3ae88c8078c4fc620995/ + * https://yellowlab.tools/result/f1066yvsyi +* Global tools (webperf, accessibility, security, ...) + * https://www.dareboost.com/fr/report/5af8684be96790618ff331da + * https://sonarwhal.com/scanner/8f0ca246-a8ac-420e-8737-6405d3ba8d59 + ### 0.8.6 * Web perf * https://www.webpagetest.org/result/180416_FA_7dffb8d4b1e9b1b8c5db99750de7248f/ @@ -103,11 +111,3 @@ * 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 3ac9701d..b6523bad 100644 --- a/documentation/en/30_Contributor_doc/README.md +++ b/documentation/en/30_Contributor_doc/README.md @@ -6,6 +6,7 @@ ----- * Checking for new dependency / plugin updates * OWASP Dependency-Check +* SonarQube report * Code coverage * Checkstyle * JavaDoc @@ -59,6 +60,19 @@ mvn dependency-check:help -Ddetail=true -Dgoal=aggregate * http://jeremylong.github.io/DependencyCheck/ * http://jeremylong.github.io/DependencyCheck/dependency-check-maven/ +## SonarQube report + +```bash +sudo docker run -d --name sonarqube -p 9004:9000 -p 9092:9092 sonarqube +git clone https://github.com/Asqatasun/Contrast-Finder +cd Contrast-finder +mvn clean install +mvn sonar:sonar -Dsonar.host.url=http://localhost:9004 +``` + +SonarQube report is available on the following URL: `http://localhost:9004` + + ## Code coverage no aggregate report (if you know how to do it…) @@ -159,4 +173,3 @@ target/site/testapidocs * [Apache Maven Javadoc Plugin](https://maven.apache.org/plugins/maven-javadoc-plugin/) * [Generate Javadocs](https://maven.apache.org/plugins/maven-javadoc-plugin/usage.html) * [Javadoc Plugin Documentation](https://maven.apache.org/plugins/maven-javadoc-plugin/javadoc-mojo.html) - diff --git a/documentation/en/30_Contributor_doc/bookmarks-for-potential-features.md b/documentation/en/30_Contributor_doc/bookmarks-for-potential-features.md index 81313f34..bb52024b 100644 --- a/documentation/en/30_Contributor_doc/bookmarks-for-potential-features.md +++ b/documentation/en/30_Contributor_doc/bookmarks-for-potential-features.md @@ -41,7 +41,19 @@ - [RGB to HSL converter](https://www.rapidtables.com/convert/color/rgb-to-hsl.html) - [RGB to HSV converter](https://www.rapidtables.com/convert/color/rgb-to-hsv.html) -# tag + +# Sorts tables + +- seems to be accessible but uses Jquery + - https://assets.cms.gov/resources/framework/2.0/Pages/datatables.html + - https://dequeuniversity.com/library/aria/tables/sf-sortable-grid +- does not use Jquery but not accessible + - http://www.trucsweb.com/tutoriels/javascript/tableau-tri/ + - https://kryogenix.org/code/browser/sorttable/ + - https://github.com/tofsjonas/sortable/ + + +# tag `` - https://caniuse.com/#search=meter - some tests : https://codepen.io/anon/pen/JLRZqZ?editors=1100 ```html @@ -220,4 +232,3 @@ D E value 9.0 - min 1 - max 7 - low 7.0 - optimun 7
``` - diff --git a/documentation/pom.xml b/documentation/pom.xml index 2942c4b1..595cc8ac 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -4,11 +4,11 @@ org.asqatasun contrast-finder - 0.9.0 + 0.9.1 documentation pom - 0.9.0 + 0.9.1 contrast-finder-documentation diff --git a/engine/api/pom.xml b/engine/api/pom.xml index 95343fc9..d835407a 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.9.0 + 0.9.1 contrast-finder-api - 0.9.0 + 0.9.1 jar api diff --git a/engine/hsv/pom.xml b/engine/hsv/pom.xml index d77112ed..cf52e5fc 100644 --- a/engine/hsv/pom.xml +++ b/engine/hsv/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.9.0 + 0.9.1 contrast-finder-hsv - 0.9.0 + 0.9.1 jar hsv diff --git a/engine/impl/pom.xml b/engine/impl/pom.xml index 9eda934c..9deaf245 100644 --- a/engine/impl/pom.xml +++ b/engine/impl/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.9.0 + 0.9.1 contrast-finder-impl - 0.9.0 + 0.9.1 jar impl diff --git a/engine/pom.xml b/engine/pom.xml index 4e49ebd5..598cc2bd 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.9.0 + 0.9.1 engine - 0.9.0 + 0.9.1 pom contrast-finder-engine diff --git a/engine/utils/pom.xml b/engine/utils/pom.xml index 91b504dd..a1a92957 100644 --- a/engine/utils/pom.xml +++ b/engine/utils/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.9.0 + 0.9.1 contrast-finder-utils - 0.9.0 + 0.9.1 jar utils 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 ca914bb8..db3f0ec7 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 @@ -222,8 +222,8 @@ private ArrayList initColorList() { * SubClass of ColorNameLookup */ public class ColorName { - public int r, g, b; - public String name; + private int r, g, b; + private String name; public ColorName(String name, int r, int g, int b) { this.r = r; this.g = g; @@ -244,4 +244,4 @@ public int getBlue() { } } -} \ No newline at end of file +} diff --git a/pom.xml b/pom.xml index 93d92750..645c7879 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.asqatasun contrast-finder pom - 0.9.0 + 0.9.1 Contrast-Finder diff --git a/webapp/pom.xml b/webapp/pom.xml index 3d7b123c..2bbf92a0 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.9.0 + 0.9.1 webapp - 0.9.0 + 0.9.1 war contrast-finder-webapp @@ -28,8 +28,8 @@ UTF-8 - 4.3.16.RELEASE - 4.2.5.RELEASE + 4.3.17.RELEASE + 4.2.6.RELEASE 1.5.2 1.2.5 8.0 diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8_es.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8_es.properties index 3e3cb929..dc83c806 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8_es.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_es.properties @@ -3,13 +3,13 @@ NOT_A_VALID_COLOR=El color debe estar comprendido entre #000000 y #FFFFFF NOT_A_VALID_RATIO.colorModel.ratio=Ratio inválido home.titleTag=Contrast Finder, encuentra los contrastes adecuados de color para crear webs accesibles (WCAG) ###### 330 characters max for "home.metaDescription" -home.metaDescription=Contrast-Finder encuentra los contrastes adecuados de color para crear webs accesibles (WCAG). \ - Esta herramienta ayuda a validar los tests de accesibilidad web (a11y) sobre contrastes de color. \ - Contrast-Finder está diseñada para ser utilizada por diseñadores web, desarrolladores web \ - o profesionales de la accesibilidad web para mejorar la facilidad de lectura de páginas HTML sitios web. +home.metaDescription=Contrast-Finder ofrece los contrastes adecuados para crear webs accesibles (WCAG). \ + Utilidad para validar tests de accesibilidad web (a11y) sobre contrastes de color. \ + Contrast-Finder está diseñada para diseñadores web, desarrolladores web \ + y otros profesionales para mejorar la facilidad de lectura de páginas HTML. logo.link.title=Volver a página inicial nav.language=español -#nav.language-switching=Switch to Español @@@TODO i18n +nav.language-switching=Cambiar a español nav.language-switching.aria-label=Idiomas result.title.colors=colores result.title.foregroundColor=texto @@ -18,7 +18,7 @@ result.title.minRation=ratio mínimo form.fillInFields=Por favor, rellena los siguientes campos: form.description=Contrast-Finder encuentra los contrastes adecuados de color para crear webs accesibles form.help=Color en hexadecimal, RGB o palabras clave de color CSS.
\ - Example: #FFFFFF, rgb(255,255,255) o white + Por ejemplo: #FFFFFF, rgb(255,255,255) o white form.foregroundColor=Color del texto form.backgroundColor=Color del fondo form.component=Color a editar @@ -52,7 +52,7 @@ form.sc-info=Contrast-Finder?
Prueba Asqatasun, la herramienta de código abierto para análisis de accesibilidad form.contrastSolutionDistance=Distancia form.contrastSolutionDistanceEx=Distancia desde el color inicial @@ -81,11 +81,11 @@ info.about=

\ Cuando el contraste no es aceptable, el objetivo principal es sugerir alternativas de contraste de color válidas. \

\

Contrast-Finder está diseñada para ser utilizada por diseñadores web, desarrolladores web \ - o profesionales de la accesibilidad web para mejorar la facilidad de lectura de páginas HTML sitios web. \ + o profesionales de la accesibilidad web para mejorar la facilidad de lectura de páginas HTML en sitios web. \

info.feedback.title=Comentarios del usuario info.feedback=

\ - Si tienes problemas o presguntas sobre Contrast-Finder, por favor, contacta con nosotros: \ + Si tienes problemas o preguntas sobre Contrast-Finder, por favor, contacta con nosotros: \

\ info.contribute.title=Contribuye a Contrast-Finder info.contribute=

\ - Todas las contribuciones son bienvenidas ! \ - Traducciones, correciones, informes de errores, nuevas características…
\ + ¡Todas las contribuciones son bienvenidas! \ + Traducciones, correcciones, informes de errores, nuevas características…
\ Siéntete libre de jugar con el \ código fuente, \ o de opinar en el foro. \ @@ -107,7 +107,7 @@ help.head=

La interfaz de Contrast-Finder es un fo

  • Color del fondo
    • \
  • Ratio mínimo
    • \
  • Color a editar
    • \ -
  • Dámelo
    • \ +
  • Dame
    • \ help.txt-color.title=Color del texto / Primer plano help.txt-color=

    \ @@ -122,12 +122,12 @@ help.txt-color=

    \ palabras clave de color CSS \ (desde CSS nivel 1 a CSS nivel 4). \

    \ -

    Color con valores hexadecimal

    \ +

    Color con valores hexadecimales

    \

    Por ejemplo: #AABBCC. \ Los valores con formato #ABC también funcionan, \ el sistema completará el campo automáticamente con el valor #AABBCC. \ Este campo puede ser usado sin el carácter #, \ - de modo que FFF o FFFFFF funcionan sin problemas. \ + de modo que FFF o FFFFFF funcionarán sin problema. \

    \

    Colores con valores RGB

    \

    Por ejemplo: rgb(255,255,255).
    \ @@ -143,16 +143,16 @@ help.color-to-edit.title=Color a editar help.color-to-edit=

    Puede referirse tanto al color del texto como al color del fondo. Por defecto ese refiere al color del texto.

    \

    El color seleccionado será modificado hasta encontrar un color válido. \ El otro color no cambiará.

    -help.algo.title=Dámelo / Los algoritmos -help.algo=

    “Colores va´lidos y muy cercanos al color inicial”

    \ +help.algo.title=Dame / Los algoritmos +help.algo=

    “Colores válidos y muy cercanos al color inicial”

    \

    \ Este es el algoritmo por defecto. \ Ofrece opciones de colores muy cercanas al color inicial. \ (La distancia de color es evaluada de forma matemática, que puede variar del punto de vista de un diseñador.) \

    \

    \ - Para algunas combinaciones de colores, el algoritmo no ofrece ningún resutado ; \ - en este caso, se recomienda usar el otro algoritmo.\ + Para algunas combinaciones de colores, el algoritmo no ofrece ningún resultado. \ + En este caso, se recomienda usar el otro algoritmo.\

    \

    “Un rango de colores válidos”

    \

    \ @@ -173,7 +173,7 @@ help.ratio=

    Hay tres posibles valores: 3, 4.5 ¿El texto está en negrita? \ \

    Nivel AA

    \ -

    Dos elementos (tamaño y negrita) nos dan cuatro combianciones:

    \ +

    Dos elementos (tamaño y negrita) nos dan cuatro combinaciones:

    \
      \
    • Texto sin negrita + tamaño de texto < 24px: ratio = 4.5
      • \
    • Texto sin negrita + tamaño de texto > 24px: ratio = 3
      • \ @@ -197,10 +197,12 @@ help.ratio=

      Hay tres posibles valores: 3, 4.5definición de texto de gran tamaño de la WCAG.

      \

      Todos los detalles sobre el ratio de contraste

      \ ######### unused i18n entries ############################################## # form.results=Results diff --git a/webapp/src/main/webapp/WEB-INF/template/head.jspf b/webapp/src/main/webapp/WEB-INF/template/head.jspf index 02820ae7..9b36550b 100644 --- a/webapp/src/main/webapp/WEB-INF/template/head.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/head.jspf @@ -62,24 +62,25 @@ diff --git a/webapp/src/main/webapp/WEB-INF/template/header.jspf b/webapp/src/main/webapp/WEB-INF/template/header.jspf index f6db1646..d627c464 100644 --- a/webapp/src/main/webapp/WEB-INF/template/header.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/header.jspf @@ -74,7 +74,7 @@
    • español
      • -
    • español
      • +
    • español
      •  diff --git a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf index 19e72107..8298ad4f 100644 --- a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf @@ -2,7 +2,7 @@ <%@ page pageEncoding="UTF-8" %> <%-- APP version --%> - + <%-- APP Name --%>