Skip to content

Commit

Permalink
Merge pull request #15 from reportportal/EPMRPP-85791
Browse files Browse the repository at this point in the history
EPMRPP-85791 || Update docker file and clear dependencies
  • Loading branch information
APiankouski authored Aug 22, 2023
2 parents 0d9f6bc + 16f1546 commit 932b0ac
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 56 deletions.
22 changes: 14 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
FROM amazoncorretto:11.0.17
LABEL version=5.8.0 description="EPAM Report portal. Complex migrations service" maintainer="Ivan Kustau <ivan_kustau@epam.com>, Hleb Kanonik <hleb_kanonik@epam.com>"
FROM gradle:6.3-jdk11 AS build
ARG APP_VERSION
WORKDIR /usr/app
COPY . /usr/app
RUN gradle build --exclude-task test -Dorg.gradle.project.version=${APP_VERSION};

# For ARM build use flag: `--platform linux/arm64`
FROM --platform=$BUILDPLATFORM amazoncorretto:11.0.17
LABEL version=${APP_VERSION} description="EPAM Report portal. Complex migrations service" maintainer="Ivan Kustau <ivan_kustau@epam.com>, Hleb Kanonik <hleb_kanonik@epam.com>"
ARG APP_VERSION=${APP_VERSION}
ENV APP_DIR=/usr/app JAVA_OPTS="-Xmx1g -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom"

# Install MinIO Client (mc)
RUN yum install -y curl && \
curl https://dl.min.io/client/mc/release/linux-amd64/mc \
-o /usr/local/bin/mc && \
chmod +x /usr/local/bin/mc

COPY ./complex-migrations-*-exec.jar complex-migrations-5.8.0-exec.jar
RUN echo 'exec java ${JAVA_OPTS} -jar complex-migrations-5.8.0-exec.jar' > /start.sh && chmod +x /start.sh

ENV JAVA_OPTS="-Xmx1g -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom"
WORKDIR $APP_DIR
COPY --from=build $APP_DIR/build/libs/complex-migrations-*exec.jar .
VOLUME ["/tmp"]
EXPOSE 8080

ENTRYPOINT ./start.sh
ENTRYPOINT exec java ${JAVA_OPTS} -jar ${APP_DIR}/complex-migrations-*exec.jar
22 changes: 0 additions & 22 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,47 +49,25 @@ ext['log4j-to-slf4j.version'] = '2.17.0'
//

dependencies {
if (releaseMode) {
implementation 'com.github.reportportal:commons-events:f130879'
} else {
implementation 'com.github.reportportal:commons-events:f130879'
}

implementation group: 'org.json', name: 'json', version: '20220320'

implementation 'net.javacrumbs.shedlock:shedlock-spring:4.21.0'
implementation 'net.javacrumbs.shedlock:shedlock-provider-jdbc-template:4.21.0'

// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'


implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-jdbc'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-amqp'
implementation 'org.springframework.boot:spring-boot-starter-aop'
implementation 'org.aspectj:aspectjweaver:1.9.7'

implementation 'com.amazonaws:aws-java-sdk-s3:1.12.456'
implementation 'software.amazon.awssdk:s3-transfer-manager:2.20.57'
implementation 'software.amazon.awssdk.crt:aws-crt:0.21.8'

implementation 'com.google.guava:guava:31.1-jre'

implementation 'org.json:json:20230227'


compile "com.rabbitmq:http-client:2.1.0.RELEASE"

runtimeOnly 'org.postgresql:postgresql'

testCompile 'org.junit.jupiter:junit-jupiter:5.5.2'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.2'
testCompile 'org.junit.jupiter:junit-jupiter-params:5.5.2'
testCompile 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
testCompile 'org.mockito:mockito-junit-jupiter:3.1.0'

}

test {
Expand Down
26 changes: 0 additions & 26 deletions docker/Dockerfile-release

This file was deleted.

0 comments on commit 932b0ac

Please sign in to comment.