From 89685c1005e8ae9a39c83547be8a52ebc9863cf9 Mon Sep 17 00:00:00 2001 From: risadmin_prod Date: Thu, 17 Sep 2026 10:18:48 +0000 Subject: [PATCH] deployment_files --- .../deployment/Dockerfile | 35 +++++++++ .../deployment/build.sh | 37 ++++++++++ .../deployment/Dockerfile | 30 ++++++++ .../deployment/build.sh | 71 +++++++++++++++++++ .../src/main/resources/application.properties | 11 ++- .../src/environments/environment.prod.ts | 4 +- .../src/environments/environment.ts | 4 +- 7 files changed, 181 insertions(+), 11 deletions(-) create mode 100755 sureops/test17sepangular-backend-b/deployment/Dockerfile create mode 100755 sureops/test17sepangular-backend-b/deployment/build.sh create mode 100755 sureops/test17sepangular-frontend-f/deployment/Dockerfile create mode 100755 sureops/test17sepangular-frontend-f/deployment/build.sh diff --git a/sureops/test17sepangular-backend-b/deployment/Dockerfile b/sureops/test17sepangular-backend-b/deployment/Dockerfile new file mode 100755 index 0000000..96b8209 --- /dev/null +++ b/sureops/test17sepangular-backend-b/deployment/Dockerfile @@ -0,0 +1,35 @@ +#pulling from github + +FROM alpine/git:v2.30.1 AS code +ARG BUILD_ID +ARG GITEA_USER +ARG GITEA_PASS +RUN echo $BUILD_ID +LABEL stage=builder +LABEL build_id=$BUILD_ID +RUN mkdir repo +WORKDIR /repo +RUN git clone http://$GITEA_USER:$GITEA_PASS@157.66.191.31:3000/risadmin_prod/test17sepangular.git +#************* Stage 2 - Maven Build ************** +FROM maven:3.9.3 AS mvn +LABEL stage=builder +LABEL build=$BUILD_ID +WORKDIR /workspace/app +COPY --from=code /repo/test17sepangular/test17sepangular-backend-b/authsec_springboot/backend/ /workspace/app +RUN mkdir builder/ +RUN mvn install -Dmaven.test.skip + +#******** Stage 3 - Docker Build ********* + +#FROM java:8-jdk-alpine +#FROM openjdk:8-jdk-alpine +FROM eclipse-temurin:8-jdk-alpine +LABEL stage=app +LABEL build=$BUILD_ID +RUN mkdir /usr/app +RUN mkdir /data +COPY --from=mvn /workspace/app/target/*jar /usr/app/gtest.jar +RUN mkdir /usr/app/sureops +WORKDIR /usr/app +EXPOSE 9292 +ENTRYPOINT ["java", "-jar", "gtest.jar"] \ No newline at end of file diff --git a/sureops/test17sepangular-backend-b/deployment/build.sh b/sureops/test17sepangular-backend-b/deployment/build.sh new file mode 100755 index 0000000..8fc605e --- /dev/null +++ b/sureops/test17sepangular-backend-b/deployment/build.sh @@ -0,0 +1,37 @@ +#!/bin/bash +PRJ_NAME=test17sepangular-backend-b +DOCKER_USER=risadmin_prod +DOCKER_PASS=adminprod1234 +DOCKER_URL=157.66.191.31:3000 +#******************** +REPO_NAME=test17sepangular +GITEA_USER=risadmin_prod +GITEA_PASS=adminprod1234 +GITEA_EMAIL=ganeshk@dekatc.com +GIT_BRANCH=main +DOMAIN=157.66.191.31:3000 +#WEB-URL-PORT +CONT_PORT=3306 +TARGET_PORT=9292 +PATH_DIR=/data/66178_1789640267590/sureops/test17sepangular-backend-b/deployment +#********************** +cd $PATH_DIR +DOCKER_TAG=1.0 +#docker system prune -f +# Stop any existing containers with the same name and ports +docker stop $PRJ_NAME >/dev/null 2>&1 || true +docker rm $PRJ_NAME >/dev/null 2>&1 || true + +# Build and push the Docker image +DOCKER_BUILDKIT=0 docker build --no-cache -t $DOCKER_URL/$DOCKER_USER/$PRJ_NAME:$DOCKER_TAG --build-arg GITEA_PASS=adminprod1234 --build-arg GITEA_USER=risadmin_prod . +docker login --username=$DOCKER_USER --password=$DOCKER_PASS $DOCKER_URL +docker tag $DOCKER_URL/$DOCKER_USER/$PRJ_NAME:$DOCKER_TAG $DOCKER_URL/$DOCKER_USER/$PRJ_NAME +docker push $DOCKER_URL/$DOCKER_USER/$PRJ_NAME +docker push $DOCKER_URL/$DOCKER_USER/$PRJ_NAME:$DOCKER_TAG +docker logout $DOCKER_URL +#docker system prune -f +# Deploy the image in a Docker container +#docker run -d --name $PRJ_NAME -p $CONT_PORT:$TARGET_PORT $DOCKER_USER/$PRJ_NAME:$DOCKER_TAG + +curl -X GET "http://157.66.191.31:31170/sureops/suredocker/updaterepo?repoName=$REPO_NAME&packageName=$PRJ_NAME" + diff --git a/sureops/test17sepangular-frontend-f/deployment/Dockerfile b/sureops/test17sepangular-frontend-f/deployment/Dockerfile new file mode 100755 index 0000000..823cdc9 --- /dev/null +++ b/sureops/test17sepangular-frontend-f/deployment/Dockerfile @@ -0,0 +1,30 @@ +# Git clone +FROM alpine/git:v2.30.1 AS code +ARG BUILD_ID +ARG GITEA_USER +ARG GITEA_PASS +RUN echo $BUILD_ID +LABEL stage=builder +LABEL build_id=$BUILD_ID +RUN mkdir repo +WORKDIR /repo +RUN git clone http://$GITEA_USER:$GITEA_PASS@157.66.191.31:3000/risadmin_prod/test17sepangular.git +# angular build +FROM node:16.20.2-alpine3.18 as build +LABEL stage=app +LABEL build_id=$BUILD_ID +WORKDIR /usr/src/app +COPY --from=code /repo/test17sepangular/test17sepangular-frontend-f/authsec_angular/frontend/angular-clarity-master/package.json /repo/test17sepangular/test17sepangular-frontend-f/authsec_angular/frontend/angular-clarity-master/package-lock.json ./ +RUN npm install +COPY --from=code /repo/test17sepangular/test17sepangular-frontend-f/authsec_angular/frontend/angular-clarity-master . +ENV NODE_OPTIONS="--max_old_space_size=4096" +RUN npm run build + +# configuring nginx web-server + +FROM nginx:1.17.1-alpine +#COPY --from=code /repo/cns-beta/springboot/angular-clarity-master/angular-clarity-master/default.conf /etc/nginx/conf.d/default.conf +COPY --from=build /usr/src/app/dist /usr/share/nginx/html +#RUN ls -a /usr/share/nginx/html/ +EXPOSE 80 + \ No newline at end of file diff --git a/sureops/test17sepangular-frontend-f/deployment/build.sh b/sureops/test17sepangular-frontend-f/deployment/build.sh new file mode 100755 index 0000000..f980747 --- /dev/null +++ b/sureops/test17sepangular-frontend-f/deployment/build.sh @@ -0,0 +1,71 @@ +#!/bin/bash +#ac +# Global Variables +PRJ_NAME="test17sepangular-frontend-f" +DOCKER_USER="risadmin_prod" +DOCKER_PASS=adminprod1234 +DOCKER_URL="157.66.191.31:3000" +REPO_NAME="test17sepangular" +GITEA_USER="risadmin_prod" +GITEA_PASS=adminprod1234 +GITEA_EMAIL="ganeshk@dekatc.com" +GIT_BRANCH="main" +DOMAIN="157.66.191.31:3000" +CONT_PORT=30167 +TARGET_PORT=80 +PATH_DIR="/data/66178_1789640267590/sureops/test17sepangular-frontend-f/deployment" +DOCKER_TAG="1.0" +MAX_RETRIES=3 +RETRY_DELAY=10 + +# Stop any existing containers with the same name and ports +docker stop "$PRJ_NAME" >/dev/null 2>&1 || true +docker rm "$PRJ_NAME" >/dev/null 2>&1 || true + +# Retry logic for Docker build +build_docker_image() { + local attempt=1 + local build_status=1 + + while [[ $attempt -le $MAX_RETRIES ]]; do + printf "Attempt %d to build Docker image...\n" "$attempt" + + DOCKER_BUILDKIT=0 docker build --no-cache \ + -t "$DOCKER_URL/$DOCKER_USER/$PRJ_NAME:$DOCKER_TAG" \ + --build-arg BUILD_ID="$DOCKER_TAG" \ + --build-arg GITEA_USER="$GITEA_USER" \ + --build-arg GITEA_PASS="$GITEA_PASS" \ + "$PATH_DIR" && build_status=0 && break + + printf "Docker build failed on attempt %d. Retrying in %d seconds...\n" "$attempt" "$RETRY_DELAY" >&2 + attempt=$((attempt + 1)) + sleep "$RETRY_DELAY" + done + + return $build_status +} + +# Build Docker image with retry logic +if ! build_docker_image; then + printf "Build process failed after %d attempts.\n" "$MAX_RETRIES" >&2 + exit 1 +fi + +# Docker login +docker login --username="$DOCKER_USER" --password="$DOCKER_PASS" "$DOCKER_URL" + +# Tag and push the Docker image +docker tag "$DOCKER_URL/$DOCKER_USER/$PRJ_NAME:$DOCKER_TAG" "$DOCKER_URL/$DOCKER_USER/$PRJ_NAME:latest" +docker push "$DOCKER_URL/$DOCKER_USER/$PRJ_NAME:latest" +docker push "$DOCKER_URL/$DOCKER_USER/$PRJ_NAME:$DOCKER_TAG" + +# Docker logout +docker logout "$DOCKER_URL" + +# Trigger repo update via curl +curl -X GET "http://157.66.191.31:31170/sureops/suredocker/updaterepo?repoName=$REPO_NAME&packageName=$PRJ_NAME" + +# Prune Docker resources +docker network prune -f +docker image prune -f --filter "dangling=true" +docker volume prune -f diff --git a/test17sepangular-backend-b/authsec_springboot/backend/src/main/resources/application.properties b/test17sepangular-backend-b/authsec_springboot/backend/src/main/resources/application.properties index 14768ee..a1b73cc 100644 --- a/test17sepangular-backend-b/authsec_springboot/backend/src/main/resources/application.properties +++ b/test17sepangular-backend-b/authsec_springboot/backend/src/main/resources/application.properties @@ -24,15 +24,15 @@ System.Net.ServicePointManager.Expect100Continue = false; # **** MY SQL DATABASE CONNECTION **** -spring.datasource.url=jdbc:mysql://realit-prod.cj462uqsa4mz.ap-south-1.rds.amazonaws.com:3306/realnet_CNSBENEW?createDatabaseIfNotExist=true +spring.datasource.url=jdbc:mysql://157.66.191.31:3306/mydbhybrid?createDatabaseIfNotExist=true spring.datasource.username=cnsdev -spring.datasource.password=cnsdevprod1212 +spring.datasource.password=cnsdev7304 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver spring.jpa.hibernate.ddl-auto=update spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect -# Prefix Path +server.servlet.contextPath=/backend #spring.jpa.show-sql=true spring.jpa.properties.hibernate.format_sql=true @@ -99,7 +99,4 @@ app.oauth2.authorizedRedirectUris=http://localhost:8081/oauth2/redirect,myandroi projectPath=/data angularProjectPath=/data/webui -BACKEND_PORTAL_DOMAIN=http://157.66.191.31:30166 - - - +BACKEND_PORTAL_DOMAIN=http://157.66.191.31:30166 \ No newline at end of file diff --git a/test17sepangular-frontend-f/authsec_angular/frontend/angular-clarity-master/src/environments/environment.prod.ts b/test17sepangular-frontend-f/authsec_angular/frontend/angular-clarity-master/src/environments/environment.prod.ts index f038c84..9eb5d25 100644 --- a/test17sepangular-frontend-f/authsec_angular/frontend/angular-clarity-master/src/environments/environment.prod.ts +++ b/test17sepangular-frontend-f/authsec_angular/frontend/angular-clarity-master/src/environments/environment.prod.ts @@ -10,8 +10,8 @@ export const environment = { // changeble url // port captchaSiteKey: '6LfrdSUpAAAAALkYDmnvdX3GLLCArgPWNHfXasjP', - //Deployment configs + backport:'46294/test17sepangular66178/backend',backendUrl:'/test17sepangular66178/backend', -}; +}; \ No newline at end of file diff --git a/test17sepangular-frontend-f/authsec_angular/frontend/angular-clarity-master/src/environments/environment.ts b/test17sepangular-frontend-f/authsec_angular/frontend/angular-clarity-master/src/environments/environment.ts index 6bfca3d..6b7075f 100644 --- a/test17sepangular-frontend-f/authsec_angular/frontend/angular-clarity-master/src/environments/environment.ts +++ b/test17sepangular-frontend-f/authsec_angular/frontend/angular-clarity-master/src/environments/environment.ts @@ -10,7 +10,7 @@ export const environment = { // changeblelocal configs url captchaSiteKey: '6LfrdSUpAAAAALkYDmnvdX3GLLCArgPWNHfXasjP', - //Deployment configs + backport:'46294/test17sepangular66178/backend',backendUrl:'/test17sepangular66178/backend', -}; +}; \ No newline at end of file