From a46f535b5b7f075b7d9385576554cff455ce7dc2 Mon Sep 17 00:00:00 2001 From: Amanmohammad2608 Date: Mon, 14 Oct 2024 06:37:16 -0700 Subject: [PATCH 1/4] Yellow bg --- webapp/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/index.html b/webapp/index.html index a683c108..82951979 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ From 7db0811c3d5673c1396ddb4d463348418a51c57a Mon Sep 17 00:00:00 2001 From: Amanmohammad2608 Date: Mon, 14 Oct 2024 06:43:36 -0700 Subject: [PATCH 2/4] bg color green --- webapp/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/index.html b/webapp/index.html index 82951979..a683c108 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ From d3706bdf40d7e5673c957b3a69ba34489114fa5d Mon Sep 17 00:00:00 2001 From: Amanmohammad2608 Date: Mon, 14 Oct 2024 06:44:02 -0700 Subject: [PATCH 3/4] v2.1 --- webapp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/package.json b/webapp/package.json index c7543640..1e2faccb 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { "name": "webapp", "private": true, - "version": "1.0.1", + "version": "2.0.1", "type": "module", "scripts": { "dev": "vite", From 0af71b2ad6b585fe1e2d6940268559cebb319454 Mon Sep 17 00:00:00 2001 From: Amanulla Mohammad Date: Fri, 12 Sep 2025 11:26:11 -0700 Subject: [PATCH 4/4] removed unwanted folders --- Jenkinsfile | 31 ------------------------------- deploy.sh | 13 ------------- docker-compose.yml | 40 ---------------------------------------- 3 files changed, 84 deletions(-) delete mode 100644 Jenkinsfile delete mode 100755 deploy.sh delete mode 100644 docker-compose.yml diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 7594545d..00000000 --- a/Jenkinsfile +++ /dev/null @@ -1,31 +0,0 @@ -pipeline { - agent any - environment { - // More detail: - // https://jenkins.io/doc/book/pipeline/jenkinsfile/#usernames-and-passwords - NEXUS_CRED = credentials('nexus') - } - - stages { - stage('Build') { - steps { - echo 'Building..' - sh 'cd webapp && npm install && npm run build' - } - } - stage('Test') { - steps { - echo 'Testing..' - sh 'cd webapp && sudo docker container run --rm -e SONAR_HOST_URL="http://20.172.187.108:9000" -e SONAR_LOGIN="sqp_cae41e62e13793ff17d58483fb6fb82602fe2b48" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' - } - } - stage('Release') { - steps { - echo 'Release Nexus' - sh 'rm -rf *.zip' - sh 'cd webapp && zip dist-${BUILD_NUMBER}.zip -r dist' - sh 'cd webapp && curl -v -u $Username:$Password --upload-file dist-${BUILD_NUMBER}.zip http://20.172.187.108:8081/repository/lms/' - } - } - } -} \ No newline at end of file diff --git a/deploy.sh b/deploy.sh deleted file mode 100755 index 92bd9536..00000000 --- a/deploy.sh +++ /dev/null @@ -1,13 +0,0 @@ -# deploy using docker compose - -cd ~/lms-public - -git pull - -if curl http://localhost:3000; then - docker compose down -fi - -docker compose up -d --build "api-server" "web-server" - -echo "Deployment done!" diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index b581b1f7..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Docker compose start container with env variables -services: - local-db: - image: postgres - environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=itjustworks - - POSTGRES_DB=mydb - ports: - - "5432:5432" - # volumes: # uncomment to persist data using bind mount - # - ./data:/var/lib/postgresql/data - # volumes: # uncomment to persist data using named volume - # - local-db-data:/var/lib/postgresql/data - - api-server: - image: lms-public-api - build: api/ - environment: - - MODE=local - - PORT=8080 - - DATABASE_URL=postgresql://postgres:itjustworks@local-db:5432/mydb - ports: - - "8080:8080" - restart: on-failure - depends_on: - - local-db - - web-server: - image: lms-web - build: webapp/ - environment: - - MODE=local - - API_URL=http://api-server:8080 - ports: - - "3000:80" - depends_on: - - api-server -# volumes: -# local-db-data: # uncomment to persist data using named volume