diff --git a/btc-UI/package-lock.json b/btc-UI/package-lock.json index a96c19e..5e0ab59 100755 --- a/btc-UI/package-lock.json +++ b/btc-UI/package-lock.json @@ -8215,9 +8215,9 @@ } }, "node_modules/form-data": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz", - "integrity": "sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", "dev": true, "license": "MIT", "dependencies": { diff --git a/btc-UI/src/app/constants/http-routs.ts b/btc-UI/src/app/constants/http-routs.ts index 8d37273..faa7833 100755 --- a/btc-UI/src/app/constants/http-routs.ts +++ b/btc-UI/src/app/constants/http-routs.ts @@ -1,6 +1,6 @@ export class ApplicationHttpRouts { private static readonly PROTOCOL: string = 'http'; - private static readonly BACKEND_SERVER: string = '192.168.0.103'; + private static readonly BACKEND_SERVER: string = '192.168.0.100'; private static readonly FRONT_PORT_NUMBER: string = '4200'; private static readonly PORT_NUMBER: string = '8083'; private static readonly SOCKET: string = `${this.PROTOCOL}://${this.BACKEND_SERVER}:${this.PORT_NUMBER}`; diff --git a/docker/dbData/base/16384/1259 b/docker/dbData/base/16384/1259 index be5684d..62ab711 100644 Binary files a/docker/dbData/base/16384/1259 and b/docker/dbData/base/16384/1259 differ diff --git a/docker/dbData/base/16384/24610 b/docker/dbData/base/16384/24610 index d00ef90..a86448f 100644 Binary files a/docker/dbData/base/16384/24610 and b/docker/dbData/base/16384/24610 differ diff --git a/docker/dbData/base/16384/24611 b/docker/dbData/base/16384/24611 index a329dc7..b351b6e 100644 Binary files a/docker/dbData/base/16384/24611 and b/docker/dbData/base/16384/24611 differ diff --git a/docker/dbData/base/16384/24615 b/docker/dbData/base/16384/24615 index 33cacbf..828808b 100644 Binary files a/docker/dbData/base/16384/24615 and b/docker/dbData/base/16384/24615 differ diff --git a/docker/dbData/base/16384/24619 b/docker/dbData/base/16384/24619 index 329ba87..5100842 100644 Binary files a/docker/dbData/base/16384/24619 and b/docker/dbData/base/16384/24619 differ diff --git a/docker/dbData/base/16384/24620 b/docker/dbData/base/16384/24620 index 38b0900..ec7f5b8 100644 Binary files a/docker/dbData/base/16384/24620 and b/docker/dbData/base/16384/24620 differ diff --git a/docker/dbData/base/16384/24620_fsm b/docker/dbData/base/16384/24620_fsm index f64db4d..e686488 100644 Binary files a/docker/dbData/base/16384/24620_fsm and b/docker/dbData/base/16384/24620_fsm differ diff --git a/docker/dbData/base/16384/24620_vm b/docker/dbData/base/16384/24620_vm index c7ba9eb..937ceca 100644 Binary files a/docker/dbData/base/16384/24620_vm and b/docker/dbData/base/16384/24620_vm differ diff --git a/docker/dbData/base/16384/24624 b/docker/dbData/base/16384/24624 index c4faa8d..995edbc 100644 Binary files a/docker/dbData/base/16384/24624 and b/docker/dbData/base/16384/24624 differ diff --git a/docker/dbData/base/16384/24626 b/docker/dbData/base/16384/24626 index 305b4e8..7acbe31 100644 Binary files a/docker/dbData/base/16384/24626 and b/docker/dbData/base/16384/24626 differ diff --git a/docker/dbData/base/16384/pg_internal.init b/docker/dbData/base/16384/pg_internal.init index 045fcee..0f5f161 100644 Binary files a/docker/dbData/base/16384/pg_internal.init and b/docker/dbData/base/16384/pg_internal.init differ diff --git a/docker/dbData/global/pg_control b/docker/dbData/global/pg_control index f82ef82..a88ee8a 100644 Binary files a/docker/dbData/global/pg_control and b/docker/dbData/global/pg_control differ diff --git a/docker/dbData/global/pg_internal.init b/docker/dbData/global/pg_internal.init index 03b83cd..346dcdc 100644 Binary files a/docker/dbData/global/pg_internal.init and b/docker/dbData/global/pg_internal.init differ diff --git a/docker/dbData/pg_wal/000000010000000000000001 b/docker/dbData/pg_wal/000000010000000000000001 index 30d74b7..25410ac 100644 Binary files a/docker/dbData/pg_wal/000000010000000000000001 and b/docker/dbData/pg_wal/000000010000000000000001 differ diff --git a/docker/dbData/pg_xact/0000 b/docker/dbData/pg_xact/0000 index 606a54c..37d37de 100644 Binary files a/docker/dbData/pg_xact/0000 and b/docker/dbData/pg_xact/0000 differ diff --git a/docker/dbData/postmaster.pid b/docker/dbData/postmaster.pid index aa571bd..c3db708 100644 --- a/docker/dbData/postmaster.pid +++ b/docker/dbData/postmaster.pid @@ -1,8 +1,8 @@ 1 /var/lib/postgresql/data -1753700354 +1753785959 5432 /var/run/postgresql * - 3938413 0 + 4063468 0 ready diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d92d0b5..ec077ed 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -31,7 +31,7 @@ services: spring: #image: mathewfrancisv/spring_back_postgres:v1.0.0 - image: mathewfrancisv/spring_alpine:v1.0.0 + image: mathewfrancisv/btc_cezen_backend:v1.0.0 container_name: spring_app ports: - "8083:8080" @@ -41,10 +41,8 @@ services: SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/horse SPRING_DATASOURCE_USERNAME: postgres # Ensure this matches POSTGRES_USER SPRING_DATASOURCE_PASSWORD: root # Ensure this matches POSTGRES_PASSWORD - SPRING_DATASOURCE_CORSIP: http://10.222.236.167:4200 + SPRING_DATASOURCE_CORSIP: http://192.168.0.100:4200 #network_mode: host - volumes: - - ../springHorse:/app networks: - app_network depends_on: diff --git a/springHorse/Dockerfile b/springHorse/Dockerfile index af21868..7d26bca 100644 --- a/springHorse/Dockerfile +++ b/springHorse/Dockerfile @@ -1,20 +1,9 @@ -# Step 1: Build the Spring Boot app -FROM maven:3.9.6-eclipse-temurin-21-alpine AS builder +FROM openjdk:21-jdk-slim + WORKDIR /app -COPY . . -RUN mvn clean package -DskipTests +COPY target/cezenhorse-0.0.1-SNAPSHOT.jar /app/app.jar -# Step 2: Run the app with a minimal Alpine JRE -FROM eclipse-temurin:21-jre-alpine -WORKDIR /app +EXPOSE 8080 +CMD ["java", "-jar", "/app/app.jar"] -# Copy the built JAR from builder stage -COPY --from=builder /app/target/*.jar app.jar - -# Optional: Add non-root user -RUN adduser -D springuser -USER springuser - -# Run the app -ENTRYPOINT ["java", "-jar", "/app/app.jar"] diff --git a/springHorse/src/main/resources/application.properties b/springHorse/src/main/resources/application.properties index 1830c7e..ff3c3f6 100755 --- a/springHorse/src/main/resources/application.properties +++ b/springHorse/src/main/resources/application.properties @@ -3,14 +3,14 @@ spring.application.name=cezenHorse #server.port=8083 server.address=0.0.0.0 -#spring.datasource.url = jdbc:postgresql://localhost:5434/horse -#spring.datasource.username = postgres -#spring.datasource.password = root - -spring.datasource.url = jdbc:postgresql://postgres:5432/horse +spring.datasource.url = jdbc:postgresql://localhost:5434/horse spring.datasource.username = postgres spring.datasource.password = root +#spring.datasource.url = jdbc:postgresql://postgres:5432/horse +#spring.datasource.username = postgres +#spring.datasource.password = root + #spring.datasource.url = jdbc:postgresql://bblablabla #spring.datasource.username = postgres #spring.datasource.password = root