ptuomola commented on a change in pull request #1986: URL: https://github.com/apache/fineract/pull/1986#discussion_r757832128
########## File path: .travis.yml ########## @@ -57,13 +48,8 @@ install: - curl -O https://cdn.azul.com/zulu/bin/zulu-repo_1.0.0-3_all.deb - sudo apt-get -yq install ./zulu-repo_1.0.0-3_all.deb - sudo apt-get -q update - - sudo apt-get -yq install zulu17-jdk - - export JAVA_HOME=/usr/lib/jvm/zulu17 - - echo "USE mysql;\nALTER USER 'root'@'localhost' IDENTIFIED BY 'mysql';\n" | mysql -u root - - mysql -u root -pmysql -e 'CREATE DATABASE IF NOT EXISTS `fineract_tenants`;' - - mysql -u root -pmysql -e 'CREATE DATABASE IF NOT EXISTS `fineract_default`;' -# Hardcoding the time zone is a temporary fix for https://issues.apache.org/jira/browse/FINERACT-723 - - export TZ=Asia/Kolkata + - sudo apt-get -yq install zulu11-jdk + - export JAVA_HOME=/usr/lib/jvm/zulu11 Review comment: This looks like it's still pointing to JDK 11? ########## File path: fineract-provider/build.gradle ########## @@ -274,10 +252,50 @@ bootJar { classifier = '' } -bootWar { - enabled = false +jib { + from { + // image = 'azul/zulu-openjdk-alpine:17-jre' // once we get rid of OpenJPA we could reduce space significantly + image = 'azul/zulu-openjdk-alpine:17' + } + + to { + image = 'fineract' + tags = [ + "${releaseVersion}", + 'latest' + ] + } + + container { + creationTime = 'USE_CURRENT_TIMESTAMP' + jvmFlags = [ + '-Duser.home=/data', + '-Xmx1G', + '-Xms1G', + '-XshowSettings:vm', + '-XX:+UseContainerSupport', + '-XX:+UseStringDeduplication', + '-XX:MinRAMPercentage=25', + '-XX:MaxRAMPercentage=80' + ] + args = [ + '-Dspring.profiles.active=basicauth', Review comment: Could we make this env parameter for the image, but default to basicauth? That way we could use the same image for all the different profiles (twofactor, oauth etc) and also run tests for each of them? ########## File path: fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java ########## @@ -45,6 +48,12 @@ private static final String LOAN_PRODUCT_SHORT_NAME = "loanProductShortName"; private static final String SAVINGS_PRODUCT_SHORT_NAME = "savingsProductShortName"; private static final String SHARE_PRODUCT_SHORT_NAME = "sharesProductShortName"; + private final ConfigurationReadPlatformService configurationReadPlatformService; + + @Autowired + public AccountNumberGenerator(final ConfigurationReadPlatformService configurationReadPlatformService) { + this.configurationReadPlatformService = configurationReadPlatformService; + } Review comment: I think these changes are from another PR that was already merged? Can you rebase your PR to develop? ########## File path: fineract-provider/build.gradle ########## @@ -274,10 +252,50 @@ bootJar { classifier = '' } -bootWar { - enabled = false +jib { + from { + // image = 'azul/zulu-openjdk-alpine:17-jre' // once we get rid of OpenJPA we could reduce space significantly + image = 'azul/zulu-openjdk-alpine:17' + } + + to { + image = 'fineract' + tags = [ + "${releaseVersion}", + 'latest' + ] + } + + container { + creationTime = 'USE_CURRENT_TIMESTAMP' + jvmFlags = [ + '-Duser.home=/data', + '-Xmx1G', + '-Xms1G', + '-XshowSettings:vm', + '-XX:+UseContainerSupport', + '-XX:+UseStringDeduplication', + '-XX:MinRAMPercentage=25', + '-XX:MaxRAMPercentage=80' + ] + args = [ + '-Dspring.profiles.active=basicauth', + '-Dfile.encoding=UTF-8', + '-Duser.timezone=UTC', Review comment: At least previously the integration tests required timezone Asia/Kalkuta to pass... does this work? ########## File path: fineract-provider/build.gradle ########## @@ -289,7 +307,6 @@ distributions { distributionBaseName = "apache-fineract-binary" contents { from bootJar - from war Review comment: Out of interest, does the distribution task actually work for you? I was yesterday working on another PR (automate updating of all the dependent licenses into the distribution) but could not get distTar etc to do anything. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
