Skip to content

Commit

Permalink
Contrast-Finder v0.8.2
Browse files Browse the repository at this point in the history
----------------------

  set version to 0.8.2
  fixed #99 / pom.xml file: replaced "-dev" by "-SNAPSHOT"
  Updated build_and_run-with-docker.sh (typo)
  fixed #99 / pom.xml file: replaced "-dev" by ".SNAPSHOT"
  refactor build documentation
  DOC - Release : using `mvn versions:set -DnewVersion=x.y.z`
  Fixed #93 - Upgraded maven-war-plugin 3.2.0  instead of 3.1.0
  Updated CHANGELOG
  fixed #94 - Upgraded outdated dependency: SpringFramework 4.3.12
  DOC - Updated Other-contrast-tools.md
  fixed #97 - build_and_run-with-docker.sh / log_processing() fails when there is no WARNING
  */pom.xml - typo
  Updated webapp/pom.xml
  webapp/pom.xml - Turn off JS warnings by yuicompressor-maven-plugin
  tar.gz - Updated descriptor.xml (don't use a root /)
  updated pom.xml
  DOC Build - Fix prerequesites
  Added documentation/badge.md
  build_and_run-with-docker.sh - refactor + fixed #95
  Fixed #93 - Upgraded maven-dependency-plugin + maven-surefire-plugin
  fixed #94 - Upgraded outdated dependency: SpringFramework 4.3.11
  Fixed #93 - Upgraded maven-compiler-plugin: 3.7.0 instead of 3.6.2
  webapp: added CSS for accessible modal window system
  webapp: added accessible modal window system from van11y.net
  Fixed #92 - Upgraded maven-compiler-plugin: 3.6.2 instead of 3.6.1
  set version to 0.8.2-dev
  • Loading branch information
dzc34 committed Oct 28, 2017
2 parents 99af9ae + 1b736fc commit e3c0282
Show file tree
Hide file tree
Showing 31 changed files with 1,215 additions and 321 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
target
*.log

# maven (mvn versions:set)
pom.xml.versionsBackup


##### GIT

Expand Down
23 changes: 22 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,33 @@
# CHANGELOG

Contrast-Finder 0.8.2, 2017-10-28
---------------------------------

Upgrade-o-meter: just replace the .war file and restart Tomcat

### Outdated dependencies
- [#93 - Upgraded maven-*-plugin (compiler, dependency, surefire and war)](https://github.com/Asqatasun/Contrast-Finder/issues/93)
- [#94 - Upgraded SpringFramework (4.3.12 instead of 4.3.10)](https://github.com/Asqatasun/Contrast-Finder/issues/94)

### Bugs
- fixed `build_and_run-with-docker.sh` script:
- [#97, log_processing() fails when there is no WARNING](https://github.com/Asqatasun/Contrast-Finder/issues/97)
- [#95, "-t" option is used 2 times](https://github.com/Asqatasun/Contrast-Finder/issues/95)

### Documentation
- refactor build documentation

### Task
- [fixed #99 / pom.xml file: replaced "-dev" by "-SNAPSHOT"](https://github.com/Asqatasun/Contrast-Finder/issues/99)


Contrast-Finder 0.8.1, 2017-08-05
---------------------------------

Upgrade-o-meter: just replace the .war file and restart Tomcat

### Improvement
- [#90 - Added <link rel="alternate" hreflang=""> ](https://github.com/Asqatasun/Contrast-Finder/issues/90)
- [#90 - Added `<link rel="alternate" hreflang="">`](https://github.com/Asqatasun/Contrast-Finder/issues/90)
- [#88 - Added missing Korean translations](https://github.com/Asqatasun/Contrast-Finder/issues/88)


Expand Down
24 changes: 13 additions & 11 deletions docker/README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
# Docker

## Build with our automated script (recommended)

We have created a shell script to ease the tasks of building locally with Docker. Basically, the script:

##  Linux users
1. compiles Contrast-Finder,
1. creates a new docker image,
1. runs a container from this image,

### Builds Contrast-Finder and runs a new Docker container

- builds Contrast-Finder from sources with maven,
- builds a new Docker image
- runs a container based the freshly built image

###  Linux users
To enjoy it, do:
```bash
git clone https://github.com/Asqatasun/Contrast-Finder
cd Contrast-finder
cd Contrast-finder
git checkout develop
docker/build_and_run-with-docker.sh -l -s ${PWD} -d docker/SNAPSHOT-local_from-Ubuntu
docker/build_and_run-with-docker.sh -l --source-dir ${PWD} --docker-dir docker/SNAPSHOT-local_from-Ubuntu
```

In your browser, go to
`http://127.0.0.1:8087/contrast-finder/`

A lot of useful options are also available to speed up the process
when you want to build / test / iterate.

You may run `./docker/build_and_run-with-docker.sh -h` to see them.

10 changes: 5 additions & 5 deletions docker/RELEASE/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
LABEL org.label-schema.schema-version = "1.0.0-rc.1" \
org.label-schema.name = "Contrast-Finder - WebApp" \
org.label-schema.version = "0.8.1" \
org.label-schema.version = "0.8.2" \
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" \
Expand All @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1"
#
# --- Building this docker image
# docker build -t asqatasun/contrast-finder .
# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.1 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.1/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.1/contrast-finder_0.8.1.i386.tar.gz .
# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.2 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.2/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.2/contrast-finder_0.8.2.i386.tar.gz .
#
# --- Launch a container
# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder
Expand All @@ -36,7 +36,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1"
###################################################################

# build variables
ARG CONTRAST_FINDER_RELEASE="0.8.1"
ARG CONTRAST_FINDER_RELEASE="0.8.2"
ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}"
ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz"

Expand Down
3 changes: 2 additions & 1 deletion docker/RELEASE/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Tool to provide color combination for a good (accessible, WCAG-compliant) contra
Supported tags and respective `Dockerfile` links :

* [pre-requisites_from-Ubuntu](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile)
* [v0.8.1, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile)
* [v0.8.2, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/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)
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local_from-Tomcat/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ FROM tomcat:7.0-jre7
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.1"
ENV CONTRAST_FINDER_RELEASE="0.8.2"
ENV TOMCAT_WEBAPP_DIR="/usr/local/tomcat/webapps"

# Prepare Contrast-Finder
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local_from-Ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.1"
ENV CONTRAST_FINDER_RELEASE="0.8.2"

# Add contrast-finder .war
ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.1"
ENV CONTRAST_FINDER_RELEASE="0.8.2"
ENV CONF_DEFAULT_ALGO="Rgb"
# ENV CONF_DEFAULT_ALGO="Rgb"
# ENV CONF_DEFAULT_ALGO="HSV"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.1"
ENV CONTRAST_FINDER_RELEASE="0.8.2"
ENV CONF_ENV="debug"

# Add contrast-finder .war
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.8.1"
ENV CONTRAST_FINDER_RELEASE="0.8.2"
ENV PIWIK_KEY="9"
ENV PIWIK_URL="http://localhost/piwik/"

Expand Down
Loading

0 comments on commit e3c0282

Please sign in to comment.