Skip to content

Commit

Permalink
feat: switched java version for docker build, github actions and mave…
Browse files Browse the repository at this point in the history
…n build
  • Loading branch information
daho4b committed Mar 29, 2021
1 parent afccab6 commit 50cafbc
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dockerImage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup JVM
uses: actions/setup-java@v1
with:
java-version: 1.8.0.181
java-version: 11.0.10
java-package: jdk
architecture: x64

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/feature-branch.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Feature Branch
name: Feature Branch

on:
push:
Expand All @@ -8,29 +8,29 @@ on:

jobs:
test:
name: Build and run unit tests
name: Build and run unit tests
runs-on: ubuntu-latest
steps:

- name: Checkout
uses: actions/checkout@v2

- name: Setup JVM
uses: actions/setup-java@v1
with:
java-version: 1.8.0.181
java-version: 11.0.10
java-package: jdk
architecture: x64

- name: Caching maven dependencies
uses: actions/cache@v1
env:
cache-name: cache-maven-dependencies
with:
path: ~/.m2/repository
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}

- name: Maven Package
run: mvn -B -Pprod clean package -DskipTests
- name: Maven Verify
run: mvn -B -Pprod clean verify
run: mvn -B -Pprod clean verify
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM openjdk:8-jdk-alpine
FROM openjdk:11.0.10-jre-slim-buster
VOLUME ["/tmp","/log"]
EXPOSE 8080
ARG JAR_FILE
COPY ./MessageService.jar app.jar
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<java.version>11</java.version>
</properties>

<dependencies>
Expand Down

0 comments on commit 50cafbc

Please sign in to comment.