From a881c280c2a227eb0201a6511567c50d26f7b12b Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 20 Nov 2016 23:17:08 +0100 Subject: [PATCH] updated README + typo --- Asqatasun/README.md | 128 ++++++++++++++++++++++++++++++ Asqatasun/jdk-7/Dockerfile | 18 ++--- Asqatasun/jdk-7/README.md | 0 Asqatasun/jdk-7/alpine/Dockerfile | 4 +- Asqatasun/jdk-7/alpine/README.md | 0 Asqatasun/jdk-8/Dockerfile | 18 ++--- Asqatasun/jdk-8/README.md | 0 Asqatasun/jdk-8/alpine/Dockerfile | 2 +- Asqatasun/jdk-8/alpine/README.md | 0 README.md | 121 +++++++--------------------- 10 files changed, 176 insertions(+), 115 deletions(-) delete mode 100644 Asqatasun/jdk-7/README.md delete mode 100644 Asqatasun/jdk-7/alpine/README.md delete mode 100644 Asqatasun/jdk-8/README.md delete mode 100644 Asqatasun/jdk-8/alpine/README.md diff --git a/Asqatasun/README.md b/Asqatasun/README.md index e69de29..a4474a5 100644 --- a/Asqatasun/README.md +++ b/Asqatasun/README.md @@ -0,0 +1,128 @@ + +----------- + +## Compilation déconnecté de l'OS via Docker + +### Images Docker maven avec préchargement + +#### avec Java 7 (open-jdk7 + maven) + +```shell +git clone https://github.com/Asqatasun/Asqatasun.git +cd Asqatasun +docker pull dzc34/asqa.mvn:jdk7 +docker run -it --rm dzc34/asqa.mvn:jdk7 /bin/bash +docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ dzc34/asqa.mvn:jdk7 mvn clean +``` + + +##### builder l'image docker +```shell +git clone https://github.com/dzc34/asqatasun_docker.maven.git +cd asqatasun_docker.maven/Asqatasun/jdk-7 +docker build -t asqa.mvn:jdk7 . +docker build -t asqa.mvn:jdk7 --build-arg GIT_BRANCH=develop . +``` + +##### Contrôler l'image +```shell +docker run -it --rm asqa.mvn:jdk7 /bin/bash +docker run -it --rm asqa.mvn:jdk7 javac -version +docker run -it --rm asqa.mvn:jdk7 java -version +docker run -it --rm asqa.mvn:jdk7 mvn -version +docker run -it --rm asqa.mvn:jdk7 dpkg -l "openjdk*" +``` + +##### Compiler Asqatasun +```shell +git clone https://github.com/Asqatasun/Asqatasun.git +cd Asqatasun +docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa.mvn:jdk7 mvn clean install +``` + +##### Nettoyer les dossiers de compilation +```shell +cd Asqatasun +docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa.mvn:jdk7 mvn clean +``` + +#### avec Java 8 (open-jdk8 + maven) + +##### builder l'image docker +```shell +git clone https://github.com/dzc34/asqatasun_docker.maven.git +cd asqatasun_docker.maven/Asqatasun/jdk-8 +docker build -t asqa.mvn:jdk8 . +docker build -t asqa.mvn:jdk8 --build-arg GIT_BRANCH=develop . +``` + +##### Contrôler l'image +```shell +docker run -it --rm asqa.mvn:jdk8 /bin/bash +docker run -it --rm asqa.mvn:jdk8 javac -version +docker run -it --rm asqa.mvn:jdk8 java -version +docker run -it --rm asqa.mvn:jdk8 mvn -version +docker run -it --rm asqa.mvn:jdk8 dpkg -l "openjdk*" +``` + +##### Compiler Asqatasun +```shell +git clone https://github.com/Asqatasun/Asqatasun.git +cd Asqatasun +docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa.mvn:jdk8 mvn clean install +``` + +##### Nettoyer les dossiers de compilation +```shell +cd Asqatasun +docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa.mvn:jdk8 mvn clean +``` + +------ + +### Images Docker officielles de maven + +#### avec Java 7 (open-jdk7 + maven) +```shell +docker pull maven:3-jdk-7 +``` +##### Tester l'image en ouvrant un shell +```shell +docker run -it --rm maven:3-jdk-8 /bin/bash +``` +##### Afficher la version du compilateur java +```shell +docker run -it --rm maven:3-jdk-8 javac -version +``` + +##### Compiler +```shell +git clone https://github.com/Asqatasun/Asqatasun.git +cd Asqatasun +docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ maven:3-jdk-7 mvn clean install +``` + +##### Nettoyer les dossiers de compilation +```shell +cd Asqatasun +docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ maven:3-jdk-7 mvn clean +``` + +#### avec Java 8 (open-jdk8 + maven) +```shell +docker pull maven:3-jdk-8 +``` + +##### Compiler +```shell +git clone https://github.com/Asqatasun/Asqatasun.git +cd Asqatasun +docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ maven:3-jdk-8 mvn clean install +``` + +##### Nettoyer les dossiers de compilation +```shell +cd Asqatasun +docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ maven:3-jdk-8 mvn clean +``` + diff --git a/Asqatasun/jdk-7/Dockerfile b/Asqatasun/jdk-7/Dockerfile index 8d5c114..c8f57e2 100644 --- a/Asqatasun/jdk-7/Dockerfile +++ b/Asqatasun/jdk-7/Dockerfile @@ -8,19 +8,19 @@ MAINTAINER Fabrice Gangler # #### usage ###################################################### # # --- BUILDING -# docker build -t asqa_mvn-jdk7 . -# docker build -t asqa_mvn-jdk7 --build-arg GIT_BRANCH=develop . +# docker build -t asqa.mvn:jdk7 . +# docker build -t asqa.mvn:jdk7 --build-arg GIT_BRANCH=develop . # # --- TESTING -# docker run -it --rm asqa_mvn-jdk7 /bin/bash -# docker run -it --rm asqa_mvn-jdk7 javac -version -# docker run -it --rm asqa_mvn-jdk7 java -version -# docker run -it --rm asqa_mvn-jdk7 mvn -version -# docker run -it --rm asqa_mvn-jdk7 dpkg -l "openjdk*" +# docker run -it --rm asqa.mvn:jdk7 /bin/bash +# docker run -it --rm asqa.mvn:jdk7 javac -version +# docker run -it --rm asqa.mvn:jdk7 java -version +# docker run -it --rm asqa.mvn:jdk7 mvn -version +# docker run -it --rm asqa.mvn:jdk7 dpkg -l "openjdk*" # # --- COMPILING -# docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa_mvn-jdk7 mvn clean install -# docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa_mvn-jdk7 mvn clean +# docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa.mvn:jdk7 mvn clean install +# docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa.mvn:jdk7 mvn clean # # # #### source code ############################################### diff --git a/Asqatasun/jdk-7/README.md b/Asqatasun/jdk-7/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/Asqatasun/jdk-7/alpine/Dockerfile b/Asqatasun/jdk-7/alpine/Dockerfile index 9883f6b..fbb8e04 100644 --- a/Asqatasun/jdk-7/alpine/Dockerfile +++ b/Asqatasun/jdk-7/alpine/Dockerfile @@ -9,7 +9,7 @@ MAINTAINER Fabrice Gangler # # --- BUILDING # docker build -t asqa.mvn:jdk7.alpine . -# docker build -t asqa.mvn:jdk7.alpine --build-arg GIT_BRANCH=develop . +# docker build -t asqa.mvn:jdk7.alpine --build-arg GIT_BRANCH=develop . # # --- TESTING # docker run -it --rm asqa.mvn:jdk7.alpine /bin/bash @@ -39,7 +39,7 @@ ARG SRC_URL="${SRC_URL_PREFIX}/${GIT_BRANCH}.zip" # build RUN cd /tmp/ && \ - apk add --no-cache openssl && \ + apk add --no-cache openssl && \ wget ${SRC_URL} && \ unzip ${GIT_BRANCH}.zip && \ cd Asqatasun-${GIT_BRANCH} && \ diff --git a/Asqatasun/jdk-7/alpine/README.md b/Asqatasun/jdk-7/alpine/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/Asqatasun/jdk-8/Dockerfile b/Asqatasun/jdk-8/Dockerfile index 78c896a..739092f 100644 --- a/Asqatasun/jdk-8/Dockerfile +++ b/Asqatasun/jdk-8/Dockerfile @@ -8,19 +8,19 @@ MAINTAINER Fabrice Gangler # #### usage ###################################################### # # --- BUILDING -# docker build -t asqa_mvn-jdk8 . -# docker build -t asqa_mvn-jdk8 --build-arg GIT_BRANCH=develop . +# docker build -t asqa.mvn:jdk8 . +# docker build -t asqa.mvn:jdk8 --build-arg GIT_BRANCH=develop . # # --- TESTING -# docker run -it --rm asqa_mvn-jdk8 /bin/bash -# docker run -it --rm asqa_mvn-jdk8 javac -version -# docker run -it --rm asqa_mvn-jdk8 java -version -# docker run -it --rm asqa_mvn-jdk8 mvn -version -# docker run -it --rm asqa_mvn-jdk8 dpkg -l "openjdk*" +# docker run -it --rm asqa.mvn:jdk8 /bin/bash +# docker run -it --rm asqa.mvn:jdk8 javac -version +# docker run -it --rm asqa.mvn:jdk8 java -version +# docker run -it --rm asqa.mvn:jdk8 mvn -version +# docker run -it --rm asqa.mvn:jdk8 dpkg -l "openjdk*" # # --- COMPILING -# docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa_mvn-jdk8 mvn clean install -# docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa_mvn-jdk8 mvn clean +# docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa.mvn:jdk8 mvn clean install +# docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa.mvn:jdk8 mvn clean # # # #### source code ############################################### diff --git a/Asqatasun/jdk-8/README.md b/Asqatasun/jdk-8/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/Asqatasun/jdk-8/alpine/Dockerfile b/Asqatasun/jdk-8/alpine/Dockerfile index 695befd..5a25960 100644 --- a/Asqatasun/jdk-8/alpine/Dockerfile +++ b/Asqatasun/jdk-8/alpine/Dockerfile @@ -9,7 +9,7 @@ MAINTAINER Fabrice Gangler # # --- BUILDING # docker build -t asqa.mvn:jdk8.alpine . -# docker build -t asqa.mvn:jdk8.alpine --build-arg GIT_BRANCH=develop . +# docker build -t asqa.mvn:jdk8.alpine --build-arg GIT_BRANCH=develop . # # --- TESTING # docker run -it --rm asqa.mvn:jdk8.alpine /bin/bash diff --git a/Asqatasun/jdk-8/alpine/README.md b/Asqatasun/jdk-8/alpine/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/README.md b/README.md index 258079d..bdc463a 100644 --- a/README.md +++ b/README.md @@ -1,127 +1,60 @@ -[![License : AGPL v3](https://img.shields.io/badge/license-AGPL3-blue.svg)](https://github.com/Asqatasun/Asqatasun/blob/master/LICENSE) +[![License : AGPL v3](https://img.shields.io/badge/license-AGPL3-blue.svg)](https://github.com/dzc34/asqa.mvn/blob/master/LICENSE) [![Release](https://img.shields.io/github/release/dzc34/asqa.mvn.svg)](https://github.com/dzc34/asqa.mvn/releases/latest) -# Docker Maven +# Docker Maven for Asqatasun @@@TODO README in english -## Compilation déconnecté de l'OS via Docker +Compilation indépendante de l'OS +via des images Docker de Maven préchargées +avec les plugins Maven nécessaire à la compilation. -### Images Docker maven avec préchargement +## Supported tags -#### avec Java 7 (open-jdk7 + maven) +Supported tags and respective `Dockerfile` links : -##### builder l'image docker -```shell -git clone https://github.com/dzc34/asqatasun_docker.maven.git -cd asqatasun_docker.maven/Asqatasun/jdk-7 -docker build -t asqa_mvn-jdk7 . -docker build -t asqa_mvn-jdk7 --build-arg GIT_BRANCH=develop . -``` +* jdk7.alpine ([Asqatasun/jdk-8/alpine/Dockerfile](https://github.com/dzc34/asqa.mvn/Asqatasun/jdk-8/alpine/Dockerfile)) +* jdk8.alpine ([Asqatasun/jdk-8/alpine/Dockerfile](https://github.com/dzc34/asqa.mvn/Asqatasun/jdk-8/alpine/Dockerfile)) +* jdk7, latest ([Asqatasun/jdk-7/Dockerfile](https://github.com/dzc34/asqa.mvn/Asqatasun/jdk-7/Dockerfile)) +* jdk8 ([Asqatasun/jdk-8/Dockerfile](https://github.com/dzc34/asqa.mvn/Asqatasun/jdk-8/Dockerfile)) -##### Contrôler l'image -```shell -docker run -it --rm asqa_mvn-jdk7 /bin/bash -docker run -it --rm asqa_mvn-jdk7 javac -version -docker run -it --rm asqa_mvn-jdk7 java -version -docker run -it --rm asqa_mvn-jdk7 mvn -version -docker run -it --rm asqa_mvn-jdk7 dpkg -l "openjdk*" -``` +## How to use this image -##### Compiler Asqatasun +### Usage ```shell -git clone https://github.com/Asqatasun/Asqatasun.git -cd Asqatasun -docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa_mvn-jdk7 mvn clean install +docker pull dzc34/asqa.mvn:jdk7 ``` -##### Nettoyer les dossiers de compilation -```shell -cd Asqatasun -docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa_mvn-jdk7 mvn clean -``` - -#### avec Java 8 (open-jdk8 + maven) - -##### builder l'image docker -```shell -git clone https://github.com/dzc34/asqatasun_docker.maven.git -cd asqatasun_docker.maven/Asqatasun/jdk-8 -docker build -t asqa_mvn-jdk8 . -docker build -t asqa_mvn-jdk8 --build-arg GIT_BRANCH=develop . -``` - -##### Contrôler l'image -```shell -docker run -it --rm asqa_mvn-jdk8 /bin/bash -docker run -it --rm asqa_mvn-jdk8 javac -version -docker run -it --rm asqa_mvn-jdk8 java -version -docker run -it --rm asqa_mvn-jdk8 mvn -version -docker run -it --rm asqa_mvn-jdk8 dpkg -l "openjdk*" -``` - -##### Compiler Asqatasun +#### Compiler Asqatasun ```shell git clone https://github.com/Asqatasun/Asqatasun.git cd Asqatasun -docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa_mvn-jdk8 mvn clean install +docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ dzc34/asqa.mvn:jdk7 mvn clean install ``` -##### Nettoyer les dossiers de compilation +#### Nettoyer les dossiers de compilation ```shell cd Asqatasun -docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ asqa_mvn-jdk8 mvn clean -``` - ------- - -### Images Docker officielles de maven - -#### avec Java 7 (open-jdk7 + maven) -```shell -docker pull maven:3-jdk-7 -``` -##### Tester l'image en ouvrant un shell -```shell -docker run -it --rm maven:3-jdk-8 /bin/bash -``` -##### Afficher la version du compilateur java -```shell -docker run -it --rm maven:3-jdk-8 javac -version +docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ dzc34/asqa.mvn:jdk7 mvn clean ``` -##### Compiler -```shell -git clone https://github.com/Asqatasun/Asqatasun.git -cd Asqatasun -docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ maven:3-jdk-7 mvn clean install -``` -##### Nettoyer les dossiers de compilation +##### Contrôler et manipuler l'image ```shell -cd Asqatasun -docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ maven:3-jdk-7 mvn clean +docker run -it --rm dzc34/asqa.mvn:jdk7 /bin/bash +docker run -it --rm dzc34/asqa.mvn:jdk7 javac -version +docker run -it --rm dzc34/asqa.mvn:jdk7 java -version +docker run -it --rm dzc34/asqa.mvn:jdk7 mvn -version ``` -#### avec Java 8 (open-jdk8 + maven) -```shell -docker pull maven:3-jdk-8 -``` +### Documentation -##### Compiler -```shell -git clone https://github.com/Asqatasun/Asqatasun.git -cd Asqatasun -docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ maven:3-jdk-8 mvn clean install -``` -##### Nettoyer les dossiers de compilation -```shell -cd Asqatasun -docker run -it --rm -v "$PWD":/usr/src/ -w /usr/src/ maven:3-jdk-8 mvn clean -``` +----------- ## Contact and discussions * [Asqatasun forum](http://forum.asqatasun.org/) * [Twitter @Asqatasun](https://twitter.com/Asqatasun) * email to `asqatasun AT asqatasun dot org` (only English, French and klingon is spoken :) ) + +