-
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.5 deleted not valid docker image Updated prerequisites and install documentation Fixed #139 - Upgrading outdated dependency: javaee-web-api (8.0 instead of 7.0) Fixed #137 - Upgrading outdated dependency: spring-security (4.2.4 instead of 4.2.3) Fixed #135 / Fixed #138 : Upgrading outdated dependencies fixed version for urlrewritefilter dependency Fixed #134 - Added new Docker image: pre-requisites_Debian_tomcat-9_jre9 (FROM tomcat:9-jre9) Fixed #133 - Webapp: allowed the HTTP header "Cache-Control: immutable" for asset files (css, js, png) Webapp - Added robots.txt file Webapp - Moved asset files (css, js, images) to the public/ directory Fixed #132 - Added new Docker image: pre-requisites_Alpine_tomcat-9 (FROM tomcat:9-jre8-alpine) Fixed #131 - Changed default docker image: ubuntu-16.04_tomcat-7 instead of ubuntu-14.04_tomcat-7 Webapp - Added env_debug-info.jsp fixed #130 - .jsp file, form tag: use "modelAttribute" instead of deprecated "commandName" Fixed #129 - Added custom HTTP error pages instead of Tomcat default pages Fixed #128 Webapp - added "charset=UTF-8" HTTP header for css, js, txt, json and xml files Fixed #127 Webapp - Added contribute.json file fixed i18n file (korean) set version to 0.8.5-SNAPSHOT
- Loading branch information
Showing
130 changed files
with
811 additions
and
222 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
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 +1 @@ | ||
| ubuntu-14.04_tomcat-7/Dockerfile | ||
| ubuntu-16.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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| distrib/ubuntu-14.04_tomcat-7/Dockerfile | ||
| distrib/ubuntu-16.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
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,58 @@ | ||
| FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-9 | ||
|
|
||
| # #### usage ###################################################### | ||
| # | ||
| # --- Building this docker image | ||
| # docker build -t asqatasun/contrast-finder:SNAPSHOT_local . | ||
| # | ||
| # --- Launch a container | ||
| # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder:SNAPSHOT_local | ||
| # | ||
| # --- Playing with this docker image | ||
| # docker exec -ti contrast.finder /bin/cat /softwares-version.txt | ||
| # docker exec -ti contrast.finder /bin/bash | ||
| # docker logs -f contrast.finder | ||
| # | ||
| # #### FROM ###################################################### | ||
| # asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-9 https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile | ||
| # |-- tomcat:9-jre8-alpine https://github.com/docker-library/tomcat/blob/master/9.0/jre8-alpine/Dockerfile | ||
| # |-- openjdk:8-jre-alpine https://github.com/docker-library/openjdk/blob/master/8-jre/alpine/Dockerfile | ||
| # |-- alpine:3.7 https://github.com/gliderlabs/docker-alpine/blob/master/versions/library-3.7/x86_64/Dockerfile | ||
| ################################################################### | ||
|
|
||
|
|
||
| # environment variables | ||
| ENV CONTRAST_FINDER_RELEASE="0.8.5" | ||
|
|
||
| # Add contrast-finder .war | ||
| ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root | ||
|
|
||
| # Install contrast-finder | ||
| RUN cd /root/contrast-*/install/ && \ | ||
| mv -v contrast-*.war contrast-finder.war && \ | ||
| mv -v contrast-*.war ${TOMCAT_DIR}webapps && \ | ||
| rm -rf /root/contrast-* && \ | ||
| echo ${CONTRAST_FINDER_RELEASE} >> ${INFO_FILE} && \ | ||
| echo "" >> ${INFO_FILE} && \ | ||
| echo "--- ${CONF_FILE} ---" >> ${INFO_FILE} && \ | ||
| cat ${CONF_FILE} >> ${INFO_FILE} && \ | ||
| echo "" >> ${INFO_FILE} && \ | ||
| echo "--- Logs -----------" >> ${INFO_FILE} && \ | ||
| echo "${TOMCAT_DIR}logs/catalina.*.log" >> ${INFO_FILE} && \ | ||
| echo "${LOG_FILE}" >> ${INFO_FILE} && \ | ||
| echo "--------------------" >> ${INFO_FILE} && \ | ||
| cat ${INFO_FILE} > ${LOG_FILE} && echo "-- Install: Ok" | ||
|
|
||
|
|
||
| # Health Check of the Docker Container | ||
| # ----> see asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-8.5 | ||
|
|
||
|
|
||
| ###### don't work ############################ | ||
| # CMD catalina.sh run ; \ | ||
| # tail -f -n 200 ${TOMCAT_DIR}logs/catalina.*.log \ | ||
| # ${LOG_FILE} | ||
| ################################################### | ||
|
|
||
| # in "tomcat:9-jre8-alpine" DockerFile | ||
| # CMD ["catalina.sh", "run"] |
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
Oops, something went wrong.