diff --git a/docker-compose.yml b/docker-compose.yml index ace282f29..8f4dd44b9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,12 +8,14 @@ services: args: - https_proxy - http_proxy + - no_proxy command: mvn -v environment: KNOWLEDGE_TEST_MAIL: 'false' MAVEN_CONFIG: /var/maven/.m2 https_proxy: ${https_proxy} http_proxy: ${http_proxy} + no_proxy: ${no_proxy} working_dir: /usr/src/mymaven/ entrypoint: '' volumes: @@ -35,6 +37,7 @@ services: environment: https_proxy: ${https_proxy} http_proxy: ${http_proxy} + no_proxy: ${no_proxy} volumes: - ${KNOWLEDGE_HOME}.knowledge:/root/.knowledge - $PWD/target/webapps:/usr/local/tomcat/webapps diff --git a/launch.sh b/launch.sh index 633d9a5ef..da93fef0f 100755 --- a/launch.sh +++ b/launch.sh @@ -1,11 +1,29 @@ #!/bin/bash -eu -docker-compose run --rm maven mvn install -DskipTests=true -Dmaven.javadoc.skip=true -e -# docker-compose run --rm maven mvn clean test site -e -docker-compose run --rm maven mvn clean package -e +propagate_proxy_vars () { + # For newer JVM versions, use this instead. + # echo " -Djava.net.useSystemProxies=true" -mkdir target/webapps -mv target/knowledge.war target/webapps/ROOT.war + if test -n "$https_proxy"; then + echo " -Dhttps.proxyHost=$(echo $https_proxy | sed 's|.*://||; s|:.*||')" + echo " -Dhttps.proxyPort=$(echo $https_proxy | sed 's|.*:||')" + fi + if test -n "$http_proxy"; then + echo " -Dhttp.proxyHost=$(echo $http_proxy | sed 's|.*://||; s|:.*||')" + echo " -Dhttp.proxyPort=$(echo $http_proxy | sed 's|.*:||')" + fi + if test -n "$no_proxy"; then + echo " -Dhttp.nonProxyHosts=$(echo $no_proxy | sed 's/,\./,*./g; s/,/|/g')" + fi +} + +docker-compose run --rm maven mvn install -DskipTests=true -Dmaven.javadoc.skip=true -e $(propagate_proxy_vars) +# docker-compose run --rm maven mvn clean test site -e $(propagate_proxy_vars) +docker-compose run --rm maven mvn clean package -e $(propagate_proxy_vars) + +# Run everything through docker-compose to work around permission issues. +docker-compose run --rm maven mkdir target/webapps +docker-compose run --rm maven mv target/knowledge.war target/webapps/ROOT.war docker-compose up --build -d tomcat docker-compose logs -f tomcat