Skip to content
Snippets Groups Projects
Commit 1c576a7d authored by Emmanuel Bruno's avatar Emmanuel Bruno
Browse files

moves to news maven images

parent 20e385e8
No related branches found
No related tags found
No related merge requests found
...@@ -222,16 +222,7 @@ docker-wrapper-run-all() ( ...@@ -222,16 +222,7 @@ docker-wrapper-run-all() (
# Runs maven in a container as the user # Runs maven in a container as the user
# see https://github.com/ebpro/docker-maven # see https://github.com/ebpro/docker-maven
docker-mvn() ( docker-mvn() (
_docker_env docker run --rm -it \
_check_commands docker
docker run \
--env IMAGE_NAME="$IMAGE_NAME" \
--env GITHUB_LOGIN="$GITHUBLOGIN" \
--env GITHUB_TOKEN="$GITHUBTOKEN" \
--env SONAR_URL="$SONAR_URL" \
--env SONAR_TOKEN="$SONAR_TOKEN" \
--env SONAR_URL="$SONAR_URL" \
--env SONAR_TOKEN="$SONAR_TOKEN" \
--env S6_LOGGING=1 \ --env S6_LOGGING=1 \
--env S6_BEHAVIOUR_IF_STAGE2_FAILS \ --env S6_BEHAVIOUR_IF_STAGE2_FAILS \
--volume "${HOME}/.m2":"/home/user/.m2" \ --volume "${HOME}/.m2":"/home/user/.m2" \
...@@ -239,16 +230,19 @@ docker-mvn() ( ...@@ -239,16 +230,19 @@ docker-mvn() (
--volume "${HOME}/.gitconfig":"/home/user/.gitconfig" \ --volume "${HOME}/.gitconfig":"/home/user/.gitconfig" \
--volume "$(pwd)":"/usr/src/mymaven" \ --volume "$(pwd)":"/usr/src/mymaven" \
--workdir /usr/src/mymaven \ --workdir /usr/src/mymaven \
--rm \
--env PUID="$(id -u)" -e PGID="$(id -g)" \ --env PUID="$(id -u)" -e PGID="$(id -g)" \
--env MAVEN_CONFIG=/home/user/.m2 \ --env MAVEN_CONFIG=/home/user/.m2 \
"${MAVEN_IMAGE:-${CI_MAVEN_DEFAULT_IMAGE}}" \ "${MAVEN_IMAGE:-"brunoe/maven"}" \
runuser --user user \ runuser --user user \
--group user \ --group user \
-- mvn --errors --threads 1C --color always --strict-checksums \ -- mvn --errors --threads 1C --color always --strict-checksums \
-Duser.home=/home/user \ -Duser.home=/home/user \
--settings /usr/src/mymaven/docker/ci-settings.xml "$@" "$@"
) )
docker-mvn-8() (MAVEN_IMAGE=brunoe/maven:8 docker-mvn $@)
docker-mvn-11() (MAVEN_IMAGE=brunoe/maven:11 docker-mvn $@)
docker-mvn-17() (MAVEN_IMAGE=brunoe/maven:17 docker-mvn $@)
docker-mvn-19() (MAVEN_IMAGE=brunoe/maven:19 docker-mvn $@)
docker-sonar-analysis() ( docker-sonar-analysis() (
docker-mvn -P jacoco,sonar \ docker-mvn -P jacoco,sonar \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment