merge with feature/build_in_docker_with_hg

This commit is contained in:
Sebastian Sdorra
2020-03-03 12:00:18 +01:00
6 changed files with 31 additions and 4 deletions

View File

@@ -15,3 +15,7 @@ charset = utf-8
[*.py]
indent_style = space
indent_size = 4
[{Makefile,**.mk}]
# Use tabs for indentation (Makefiles require tabs)
indent_style = tab

View File

@@ -1,2 +1,2 @@
# Keep this version number in sync with Jenkinsfile
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip

5
Jenkinsfile vendored
View File

@@ -1,7 +1,7 @@
#!groovy
// Keep the version in sync with the one used in pom.xml in order to get correct syntax completion.
@Library('github.com/cloudogu/ces-build-lib@59d3e94')
@Library('github.com/cloudogu/ces-build-lib@1.35.1')
import com.cloudogu.ces.cesbuildlib.*
node('docker') {
@@ -103,8 +103,7 @@ node('docker') {
String mainBranch
Maven setupMavenBuild() {
// Keep this version number in sync with .mvn/maven-wrapper.properties
Maven mvn = new MavenWrapper(this)
Maven mvn = new MavenWrapperInDocker(this, "scmmanager/java-build:11.0.6_10")
if (isMainBranch()) {
// Release starts javadoc, which takes very long, so do only for certain branches

12
build/Dockerfile Normal file
View File

@@ -0,0 +1,12 @@
FROM adoptopenjdk/openjdk11:x86_64-debian-jdk-11.0.6_10
# install required packages
RUN apt-get update \
&& apt-get install -y \
# mercurial is requried for integration tests of the scm-hg-plugin
mercurial \
# git is required by yarn install of scm-ui
git \
# clear apt caching
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

9
build/Makefile Normal file
View File

@@ -0,0 +1,9 @@
VERSION:=11.0.6_10
.PHONY:build
build:
docker build -t scmmanager/java-build:${VERSION} .
.PHONY:publish
publish: build
docker push scmmanager/java-build:${VERSION}

3
build/README.md Normal file
View File

@@ -0,0 +1,3 @@
# Build tools
This folder contains tools required to build scm-manager