Merge remote-tracking branch 'origin/master'

.github/workflows/docker-image.yml → .github/workflows/ci.yml

@@ -1,23 +1,24 @@
-name: Docker Image CI
+name: CI Workflow
 
 on:
-  push:
+ push:
     branches: [ "master" ]
-  pull_request:
+ pull_request:
     branches: [ "master" ]
-  workflow_dispatch:
+ workflow_dispatch:
 
 jobs:
-
-  build:
-
+ build:
     runs-on: ubuntu-latest
+    env: 
+      MAIL_USERNAME: ${{ secrets.EMAIL_NAME }}
+      MAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }}
 
     services:
       postgres:
         image: postgres
         env:
-          POSTGRES_DB: online_store
+          POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
           POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
           POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
         options: >-
@@ -36,25 +37,20 @@ jobs:
         java-version: '17'
         distribution: 'temurin'
         cache: maven
-
     - name: Build with Maven
       run: mvn -B package --file pom.xml
-
     - name: Build and test
       run: chmod +x mvnw && ./mvnw clean package
-
     - name: Log in to Docker Hub
       uses: docker/login-action@v3
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_TOKEN }}
-
     - name: Extract metadata (tags, labels) for Docker
       id: meta
       uses: docker/metadata-action@v1
       with:
         images: migupele/java_school_online_store_api
-
     - name: Build and push Docker image
       uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
       with:
@@ -63,3 +59,5 @@ jobs:
         push: true
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
+    - name: Update dependency graph
+      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6