EPMRPP-85017 || Postfix for bucket names in binary storage (#266)

* EPMRPP-85017 || Postfix for bucket names in binary storage * EPMRPP-85017 || Update dockerfile --------- Co-authored-by: Andrei Piankouski <[email protected]> Co-authored-by: Reingold Shekhtel <[email protected]>
reportportal · Jul 24, 2023 · 7ed5391 · 7ed5391
1 parent 14f33f3
commit 7ed5391
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 233 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ hs_err_pid*
 .idea/
 build/
 .gradle/
+.vscode/
diff --git a/.travis.yml b/.travis.yml
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,25 @@
-FROM alpine:latest
-LABEL version=5.8.1 description="Unified Authorization Trap for all ReportPortal's Services" maintainer="Andrei Varabyeu <[email protected]>, Hleb Kanonik <[email protected]>"
-ARG GH_TOKEN
-RUN echo 'exec java ${JAVA_OPTS} -jar service-authorization-5.8.1-exec.jar' > /start.sh && chmod +x /start.sh && \
-	wget --header="Authorization: Bearer ${GH_TOKEN}"  -q https://maven.pkg.github.com/reportportal/service-authorization/com/epam/reportportal/service-authorization/5.8.1/service-authorization-5.8.1-exec.jar
-ENV JAVA_OPTS="-Xmx512m -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom"
+FROM gradle:6.8.3-jdk11 AS build
+ARG BOM_VERSION MIGRATION_VERSION GITHUB_USER GITHUB_TOKEN RELEASE_MODE SCRIPTS_VERSION APP_VERSION
+WORKDIR /usr/app
+COPY . /usr/app
+RUN if [ ${RELEASE_MODE} = true ]; then \
+    gradle build --exclude-task test \
+        -PreleaseMode=true \
+        -PgithubUserName=${GITHUB_USER} \
+        -PgithubToken=${GITHUB_TOKEN} \
+        -Pscripts.version=${SCRIPTS_VERSION} \
+        -Pmigrations.version=${MIGRATION_VERSION} \
+        -Pbom.version=${BOM_VERSION} \
+        -Dorg.gradle.project.version=${APP_VERSION}; \
+    else gradle build --exclude-task test -Dorg.gradle.project.version=${APP_VERSION}; fi
+
+# For ARM build use flag: `--platform linux/arm64`
+FROM --platform=$BUILDPLATFORM amazoncorretto:11.0.19
+LABEL version=${APP_VERSION} description="EPAM Report portal. Main API Service" maintainer="Andrei Varabyeu <[email protected]>, Hleb Kanonik <[email protected]>"
+ARG APP_VERSION=${APP_VERSION}
+ENV APP_DIR=/usr/app JAVA_OPTS="-Xmx1g -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom"
+WORKDIR $APP_DIR
+COPY --from=build $APP_DIR/build/libs/service-authorization-*exec.jar .
 VOLUME ["/tmp"]
 EXPOSE 8080
-ENTRYPOINT ./start.sh
+ENTRYPOINT exec java ${JAVA_OPTS} -jar ${APP_DIR}/service-authorization-*exec.jar
diff --git a/Jenkinsfile.k8s.groovy b/Jenkinsfile.k8s.groovy
diff --git a/build.gradle b/build.gradle
@@ -53,7 +53,7 @@ dependencies {
         compile 'com.epam.reportportal:commons-rules'
         compile 'com.epam.reportportal:commons-model'
     } else {
-        compile 'com.github.reportportal:commons-dao:d6966878ef'
+        compile 'com.github.reportportal:commons-dao:c0d3d19'
         compile 'com.github.reportportal:commons-rules:331c402'
         compile 'com.github.reportportal:commons-model:d61b714'
     }

diff --git a/docker/Dockerfile-dev-release b/docker/Dockerfile-dev-release
diff --git a/docker/Dockerfile-develop b/docker/Dockerfile-develop
diff --git a/docker/Dockerfile-release b/docker/Dockerfile-release
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -90,5 +90,6 @@ datastore:
   accessKey:
   secretKey:
   bucketPrefix: prj-
+  bucketPostfix:
   defaultBucketName: rp-bucket
   region: us-west-1
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,3 +21,4 @@ hs_err_pid* @@
     .idea/
     build/
     .gradle/
+    .vscode/