update Vaadin UI version up to 23 release

kochetkov-ma · Jul 9, 2022 · 3927a8e · 3927a8e
1 parent cfaf035
commit 3927a8e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,7 @@
+node_modules/
+.helm/
+.github/
+build/
+.idea/
+.gradle/
+tmp/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,9 +5,6 @@ on:
     tags:
       - 'v*.*.*'
 
-env:
-  NODE_VERSION: 16.15.0
-
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,9 @@
-FROM gradle:6.9.2-jdk11-alpine as build
+FROM gradle:6.9.2-jdk11 as build
 COPY . .
 ARG RELEASE_VERSION=${RELEASE_VERSION:-0.0.0}
-ARG NODE_VERSION=${NODE_VERSION:-16.15.0}
-RUN gradle -Pversion=docker --no-daemon -PnodeVersion=v$NODE_VERSION vaadinBuildFrontend bootJar
+RUN gradle -Pversion=docker -i -s --no-daemon bootJar
 
-FROM openjdk:11.0.15-jre11.0.15-jre-slim-bullseye as production
+FROM openjdk:11.0.15-jre-slim-bullseye as production
 COPY --from=build /home/gradle/build/libs/allure-server-docker.jar /allure-server-docker.jar
 # Set port
 EXPOSE ${PORT:-8080}

diff --git a/build.gradle b/build.gradle
@@ -45,7 +45,7 @@ wrapper {
 }
 vaadin {
     nodeVersion = 'v16.15.0'
-    pnpmEnable = true
+    pnpmEnable = false
     productionMode = true
 }
 classes {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,9 +5,6 @@ on: @@
         tags:
           - 'v*.*.*'
-    env:
-      NODE_VERSION: 16.15.0
     jobs:
       build:
         runs-on: ubuntu-latest
@@ Expand Down @@