Move script related to certificates for java services in java-common directory

Signed-off-by: freddidierRTE <[email protected]>

Author: freddidierRTE

backend/businessconfig/build.gradle

@@ -76,8 +76,8 @@ task buildDocker(type: Exec) {
 
 task copyScriptsForDockerImage(type: Copy) {
     description 'copy script for docker image'
-    from "$project.projectDir/../../src/main/docker/add-certificates.sh"
-    from "$project.projectDir/../../src/main/docker/java-config-docker-entrypoint.sh"
+    from "$project.projectDir/../java-common/add-certificates.sh"
+    from "$project.projectDir/../java-common/java-config-docker-entrypoint.sh"
     into "$project.projectDir/build/docker"
     doFirst {
         logger.info "creating $project.projectDir/build/dockerFiles/"

backend/cards-consultation/build.gradle

@@ -76,8 +76,8 @@ task buildDocker(type: Exec) {
 
 task copyScriptsForDockerImage(type: Copy) {
     description 'copy script for docker image'
-    from "$project.projectDir/../../src/main/docker/add-certificates.sh"
-    from "$project.projectDir/../../src/main/docker/java-config-docker-entrypoint.sh"
+    from "$project.projectDir/../java-common/add-certificates.sh"
+    from "$project.projectDir/../java-common/java-config-docker-entrypoint.sh"
     into "$project.projectDir/build/docker"
     doFirst {
         logger.info "creating $project.projectDir/build/dockerFiles/"

backend/cards-publication/build.gradle

@@ -89,8 +89,8 @@ task buildDocker(type: Exec) {
 
 task copyScriptsForDockerImage(type: Copy) {
     description 'copy script for docker image'
-    from "$project.projectDir/../../src/main/docker/add-certificates.sh"
-    from "$project.projectDir/../../src/main/docker/java-config-docker-entrypoint.sh"
+    from "$project.projectDir/../java-common/add-certificates.sh"
+    from "$project.projectDir/../java-common/java-config-docker-entrypoint.sh"
     into "$project.projectDir/build/docker"
     doFirst {
         logger.info "creating $project.projectDir/build/dockerFiles/"

backend/external-devices/build.gradle

@@ -74,8 +74,8 @@ task buildDocker(type: Exec) {
 
 task copyScriptsForDockerImage(type: Copy) {
     description 'copy script for docker image'
-    from "$project.projectDir/../../src/main/docker/add-certificates.sh"
-    from "$project.projectDir/../../src/main/docker/java-config-docker-entrypoint.sh"
+    from "$project.projectDir/../java-common/add-certificates.sh"
+    from "$project.projectDir/../java-common/java-config-docker-entrypoint.sh"
     into "$project.projectDir/build/docker"
     doFirst {
         logger.info "creating $project.projectDir/build/dockerFiles/"

src/main/docker/add-certificates.sh renamed to backend/java-common/add-certificates.sh

@@ -75,8 +75,8 @@ task buildDocker(type: Exec) {
 
 task copyScriptsForDockerImage(type: Copy) {
     description 'copy script for docker image'
-    from "$project.projectDir/../../src/main/docker/add-certificates.sh"
-    from "$project.projectDir/../../src/main/docker/java-config-docker-entrypoint.sh"
+    from "$project.projectDir/../java-common/add-certificates.sh"
+    from "$project.projectDir/../java-common/java-config-docker-entrypoint.sh"
     into "$project.projectDir/build/docker"
     doFirst {
         logger.info "creating $project.projectDir/build/dockerFiles/"

src/main/docker/java-config-docker-entrypoint.sh renamed to backend/java-common/java-config-docker-entrypoint.sh

@@ -5,9 +5,8 @@ ARG JAR_FILE
 RUN apk add bash --no-cache
 ENV SPRING_CONFIG_NAME=common,application,external-app
 ENV SPRING_CONFIG_LOCATION=classpath:/application.yml,./config/,./external-config/
-COPY build/docker/add-certificates.sh /add-certificates.sh
 COPY build/docker/java-config-docker-entrypoint.sh /docker-entrypoint.sh
 COPY build/libs/${JAR_FILE} app.jar
 RUN mkdir -p /config
 RUN mkdir -p /external-config
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["/docker-entrypoint.sh"]

backend/users/build.gradle

@@ -56,8 +56,7 @@ jar {
 
 task copyScriptsForDockerImage(type: Copy) {
 	description 'copy script for docker image'
-	from "$project.projectDir/../../src/main/docker/add-certificates.sh"
-	from "$project.projectDir/../../src/main/docker/java-config-docker-entrypoint.sh"
+	from "$project.projectDir/java-config-docker-entrypoint.sh"
 	into "$project.projectDir/build/docker"
 	doFirst {
 		logger.info "creating $project.projectDir/build/dockerFiles/"

test/externalApp/Dockerfile

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Copyright (c) 2018-2025, RTE (http://www.rte-france.com)
+# See AUTHORS.txt
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+# This file is part of the OperatorFabric project.
+
+
+exec java -agentlib:jdwp=transport=dt_socket,address=5005,server=y,suspend=n $JAVA_OPTIONS -jar /app.jar
+