Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #154 - Update to Piranha 24.3.0 #155

Merged
merged 1 commit into from Mar 27, 2024
Merged

Fixes #154 - Update to Piranha 24.3.0 #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Expand Up @@ -14,11 +14,11 @@ jobs:
steps:
- name: Checkout Sources
uses: actions/checkout@v3
- name: Setup Java 21
- name: Setup Java 22
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 21
java-version: 22
- name: Build WAR
run: |
sudo apt-get update
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Expand Up @@ -14,9 +14,9 @@
<!-- dependencies -->
<jakartaee.version>10.0.0</jakartaee.version>
<junit.version>5.10.2</junit.version>
<piranha.version>24.2.0</piranha.version>
<piranha.version>24.3.0</piranha.version>
<!-- other -->
<java.version>21</java.version>
<java.version>22</java.version>
<piranha.distribution>webprofile</piranha.distribution>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- plugins -->
Expand Down Expand Up @@ -124,7 +124,7 @@
<dependency>
<groupId>com.microsoft.playwright</groupId>
<artifactId>playwright</artifactId>
<version>1.28.1</version>
<version>1.42.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions src/main/docker/Dockerfile
View file
Open in desktop
@@ -1,7 +1,7 @@
#
# Build the WAR file
#
FROM eclipse-temurin:21 AS builder
FROM eclipse-temurin:22 AS builder
ENV MAVEN_VERSION 3.8.6
RUN cd /usr/local && \
curl -O https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz && \
Expand All @@ -14,16 +14,16 @@ RUN export PATH=$PATH:/usr/local/apache-maven-$MAVEN_VERSION/bin && \
#
# Download the Piranha Web Profile distribution
#
FROM eclipse-temurin:21 AS dist
ENV PIRANHA_VERSION 23.10.0
FROM eclipse-temurin:22 AS dist
ENV PIRANHA_VERSION 24.3.0
WORKDIR /root
RUN curl -O https://repo1.maven.org/maven2/cloud/piranha/dist/piranha-dist-webprofile/$PIRANHA_VERSION/piranha-dist-webprofile-$PIRANHA_VERSION.jar && \
mv piranha-dist-webprofile-$PIRANHA_VERSION.jar piranha-dist-webprofile.jar

#
# Run the application
#
FROM eclipse-temurin:21
FROM eclipse-temurin2221
RUN useradd -m piranha
EXPOSE 8080
COPY --from=builder /root/target/piranha-start.war /home/piranha/ROOT.war
Expand Down