bugfix: fix PR

thongdanghoang · Nov 24, 2024 · 4f03b56 · 4f03b56
1 parent 8eb79b0
commit 4f03b56
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
         module: [ 'sep490-common', 'sep490-idp' ]
     steps:
       - name: Extract version from branch name
-        run: echo "VERSION=${GITHUB_REF#refs/heads/release/}" >> $GITHUB_ENV
+        run: echo "VERSION=${GITHUB_REF#refs/heads/release/}" >> "$GITHUB_ENV"
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
@@ -33,7 +33,9 @@ jobs:
       - name: Build with Gradle
         timeout-minutes: 15
         run: |
-          ./gradlew build --scan
+          ./gradlew build \
+          --no-daemon \
+          -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=1g"
         working-directory: ${{ matrix.module }}
 
       - name: Login to Docker Hub
@@ -60,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Extract version from branch name
-        run: echo "VERSION=${GITHUB_REF#refs/heads/release/}" >> $GITHUB_ENV
+        run: echo "VERSION=${GITHUB_REF#refs/heads/release/}" >> "$GITHUB_ENV"
       - uses: actions/checkout@v4
       - name: Use Node.js
         uses: actions/setup-node@v4

diff --git a/sep490-frontend/package.json b/sep490-frontend/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng lint & ng serve",
-    "build": "ng lint & ng build --configuration=production --base-href https://example.com/",
-    "watch": "ng lint & ng build --watch --configuration development",
+    "start": "ng lint && ng serve",
+    "build": "ng lint && ng build --configuration=production --base-href https://example.com/",
+    "watch": "ng lint && ng build --watch --configuration development",
     "test": "ng test",
     "lint": "ng lint"
   },

diff --git a/sep490-idp/Dockerfile b/sep490-idp/Dockerfile
@@ -1,15 +1,3 @@
-FROM eclipse-temurin:21-jdk-alpine
+FROM eclipse-temurin:21.0.2_13-jdk-alpine
 COPY target/*.jar app.jar
-ARG DB_HOST
-ARG DB_PORT
-ARG DB_NAME
-ARG DB_SCHEMA
-ARG POSTGRES_USER
-ARG POSTGRES_PASSWORD
-ENV DB_HOST=$DB_HOST
-ENV DB_PORT=$DB_PORT
-ENV DB_NAME=$DB_NAME
-ENV DB_SCHEMA=$DB_SCHEMA
-ENV POSTGRES_USER=$POSTGRES_USER
-ENV POSTGRES_PASSWORD=$POSTGRES_PASSWORD
 ENTRYPOINT ["java", "-jar", "/app.jar"]