tu55eladd
diff --git a/Diff for: ‎.DS_Store
8 KB b/Diff for: ‎.DS_Store
8 KB
diff --git a/Diff for: ‎.github/workflows/main.yml
+5-5 b/Diff for: ‎.github/workflows/main.yml
+5-5
diff --git a/Diff for: ‎.gitignore
+1 b/Diff for: ‎.gitignore
+1
diff --git a/Diff for: ‎.idea/runConfigurations/MainTest___lokal_database.xml
+1-1 b/Diff for: ‎.idea/runConfigurations/MainTest___lokal_database.xml
+1-1
diff --git a/Diff for: ‎.idea/runConfigurations/MainTest___testmiljodatabase.xml
+1-1 b/Diff for: ‎.idea/runConfigurations/MainTest___testmiljodatabase.xml
+1-1
diff --git a/Diff for: ‎Dockerfile
+2-3 b/Diff for: ‎Dockerfile
+2-3
diff --git a/Diff for: ‎README.md
-2 b/Diff for: ‎README.md
-2
diff --git a/Diff for: ‎jvmtop-0.8.0/INSTALL
-20 b/Diff for: ‎jvmtop-0.8.0/INSTALL
-20
diff --git a/Diff for: ‎jvmtop-0.8.0/jvmtop.bat
-4 b/Diff for: ‎jvmtop-0.8.0/jvmtop.bat
-4
diff --git a/Diff for: ‎jvmtop-0.8.0/jvmtop.jar
-98.3 KB b/Diff for: ‎jvmtop-0.8.0/jvmtop.jar
-98.3 KB
diff --git a/Diff for: ‎jvmtop-0.8.0/jvmtop.sh
-24 b/Diff for: ‎jvmtop-0.8.0/jvmtop.sh
-24
diff --git a/Diff for: ‎nais-q.yaml
+2-2 b/Diff for: ‎nais-q.yaml
+2-2
@@ -12,10 +12,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Set up cache
         uses: actions/cache@v1
         with:
@@ -33,18 +33,18 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Set up cache
         uses: actions/cache@v1
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-maven-
       - name: Build maven artifacts
-        run: mvn -s settings.xml -P github -Dgithub.token=${{ secrets.GITHUB_TOKEN }} -B package
+        run: mvn -s settings.xml -P github -Dgithub.token=${{ secrets.GITHUB_TOKEN }} -B package -D skipTests
       - name: Build and push Docker image
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -3,3 +3,4 @@
 *.iml
 *.log
 target
+.DS_Store
@@ -1,3 +1,2 @@
-FROM docker.pkg.github.com/navikt/pus-nais-java-app/pus-nais-java-app:java8
-ADD jvmtop-0.8.0 /jvmtop
-ADD /target/veilarbportefolje /app
+FROM docker.pkg.github.com/navikt/pus-nais-java-app/pus-nais-java-app:java11
+COPY /target/veilarbportefolje.jar app.jar
@@ -73,8 +73,6 @@ select * from dba_scheduler_jobs;
 | /internal/oppdater_tiltak                             | Les inn tiltaksfil fra arena og oppdater database                |
 | /internal/populer_krr                                 | Hent data om reservasjon i krr og oppdater database              |
 | /internal/reset_feed_oppfolging                       | Spol tilbake feed som overfører data om veiledertilordninger     |
-| /internal/reset_feed_dialog                           | Spol tilbake feed som overfører dialoger fra aktivitetsplanen    |
-| /internal/reset_feed_aktivitet                        | Spol tilbake feed som overfører aktiviteter fra aktivitetsplanen |
 | /internal/slett_aktivitet?aktivitetId=<id>            | Slett aktivitet fra database og indeks                            |
 
 
 
@@ -39,7 +39,7 @@ spec:
     timeout: 10
   prometheus:
     enabled: true
-    path: veilarbportefolje/internal/metrics
+    path: veilarbportefolje/internal/prometheus
   resources:
     limits:
       cpu: "4"
@@ -49,4 +49,4 @@ spec:
       memory: 4Gi
   env:
     - name: JAVA_OPTS
-      value: "-Xms2048m -Xmx8096m"
+      value: "-Xms4098m -Xmx8096m"
-Original file line number
+Diff line change
 *.iml
 *.log
 target
 +.DS_Store