-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
---------------------- set version to 0.8.4 typo Webapp - Added .well-known/security.txt Fixed #108 - Upgraded SpringFramework (4.3.14 instead of 4.3.13) Fixed #125 - Maven builds need openjdk 8 (jdeb prerequisites) Fixed #124 - Updated jdeb config. (creating debian package at the maven build) Replaced some "http://" by "https://" (W3C links and AGPL link) Fixed js and css URL Fixed #123 - Upgraded outdated dependency: native2ascii-maven-plugin (2.0.0 instead of 1.0-beta-1) Fixed #121 - Upgraded outdated dependency: maven-checkstyle-plugin (3.0.0 instead of 2.17) Fixed #120 - Upgraded outdated dependency: jacoco-maven-plugin (0.8.0 instead of 0.7.9) Fixed #119 - Upgraded outdated dependency: maven-javadoc-plugin (3.0.0 instead of 3.0.0-M1) Fixed #118 - Upgraded outdated dependency: jdeb (1.6 instead of 1.5) Docker - Removed legacy debian Dockerfile Docker - fixed #116 + fixed #117 Docker: refactoring the directories and docker images names fixed #115 - Updated prerequisites : libspring-instrument-java is not needed preparing #115 - Added some Dockerfile files for tests Doc - added QA-tools.md docker/SNAPSHOT - Flagged Debian-8 file like a legacy Debian ...
- Loading branch information
Showing
140 changed files
with
3,336 additions
and
633 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| language: java | ||
| jdk: | ||
| - openjdk7 | ||
| jdk: openjdk8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ubuntu-14.04_tomcat-7/Dockerfile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7 | ||
| LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ | ||
| org.label-schema.name = "Contrast-Finder - WebApp (tomcat7 < jdk7 < alpine 3.7)" \ | ||
| org.label-schema.version = "0.8.4" \ | ||
| org.label-schema.url = "https://contrast-finder.org" \ | ||
| org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ | ||
| org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder:alpine" \ | ||
| org.label-schema.usage = "https://github.com/Asqatasun/Contrast-Finder/tree/develop/documentation/" \ | ||
| org.label-schema.description = "Contrast-Finder finds correct color contrasts for web accessibility." | ||
| # ----> documentation http://label-schema.org/ | ||
|
|
||
| # #### usage ###################################################### | ||
| # | ||
| # --- Building this docker image | ||
| # docker build -t asqatasun/contrast-finder . | ||
| # docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.4 . | ||
| # docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.4/ . | ||
| # docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.4/contrast-finder-webapp_0.8.4.tar.gz . | ||
| # | ||
| # --- Launch a container | ||
| # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder | ||
| # | ||
| # --- Playing with this docker image | ||
| # docker exec -ti contrast.finder /bin/cat /softwares-version.txt | ||
| # docker exec -ti contrast.finder /bin/bash | ||
| # docker logs -f contrast.finder | ||
| # | ||
| # #### source code ############################################### | ||
| # https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz | ||
| # could be overridden with --build-arg CONTRAST_FINDER_RELEASE=<release> | ||
| # could be overridden with --build-arg SRC_URL_PREFIX=<url_prefix> | ||
| # could be overridden with --build-arg SRC_URL=<url> | ||
| # | ||
| # #### FROM ###################################################### | ||
| # asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile | ||
| # |-- tomcat:7-jre7-alpine https://github.com/docker-library/tomcat/blob/master/7/jre7-alpine/Dockerfile | ||
| # |-- openjdk:7-jre-alpine https://github.com/docker-library/openjdk/blob/master/7-jre/alpine/Dockerfile | ||
| # |-- alpine:3.7 https://github.com/gliderlabs/docker-alpine/blob/master/versions/library-3.7/x86_64/Dockerfile | ||
| ################################################################### | ||
|
|
||
| # build variables | ||
| ARG CONTRAST_FINDER_RELEASE="0.8.4" | ||
| ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" | ||
| ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" | ||
|
|
||
| # Install contrast-finder | ||
| RUN cd /root/ && \ | ||
| wget ${SRC_URL} && \ | ||
| tar -xzvf contrast-*.tar.gz && \ | ||
| cd /root/contrast-*/install/ && \ | ||
| mv -v contrast-*.war contrast-finder.war && \ | ||
| mv -v contrast-*.war ${TOMCAT_DIR}webapps && \ | ||
| rm -rf /root/contrast-* && \ | ||
| echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ | ||
| echo "" >> ${INFO_FILE} && \ | ||
| echo "--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ | ||
| cat ${CONF_FILE} >> ${INFO_FILE} && \ | ||
| echo "" >> ${INFO_FILE} && \ | ||
| echo "--- Logs -----------" >> ${INFO_FILE} && \ | ||
| echo "${TOMCAT_DIR}logs/catalina.*.log" >> ${INFO_FILE} && \ | ||
| echo "${LOG_FILE}" >> ${INFO_FILE} && \ | ||
| echo "--------------------" >> ${INFO_FILE} && \ | ||
| cat ${INFO_FILE} > ${LOG_FILE} && echo "-- Install: Ok" | ||
|
|
||
| # environment variables | ||
| ENV CONTRAST_FINDER=${CONTRAST_FINDER_RELEASE} | ||
| ENV SRC=${SRC_URL} | ||
|
|
||
|
|
||
| # Health Check of the Docker Container | ||
| # ----> see asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7 | ||
|
|
||
|
|
||
| ###### don't work ############################ | ||
| # CMD catalina.sh run ; \ | ||
| # tail -f -n 200 ${TOMCAT_DIR}logs/catalina.*.log \ | ||
| # ${LOG_FILE} | ||
| ################################################### | ||
|
|
||
| # in "tomcat:7-jre7-alpine" DockerFile | ||
| # CMD ["catalina.sh", "run"] | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../README.md |
Oops, something went wrong.