From 6209d2480194accb16866f713614297103085bbb Mon Sep 17 00:00:00 2001 From: James Yuzawa Date: Mon, 31 Jul 2023 22:00:34 -0400 Subject: [PATCH] fix java mins --- .github/workflows/release.yml | 3 +-- Dockerfile | 2 +- build.gradle | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1f11692..b689ebb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,10 +80,9 @@ jobs: run: echo ::set-output name=filename::$(basename $(find build/distributions -name "*.deb")) - name: Upload to Packagecloud run: | - bundle exec package_cloud push yuzawa-san/googolplex-theater/raspbian/buster ./build/distributions/${{ steps.get_deb.outputs.filename }} bundle exec package_cloud push yuzawa-san/googolplex-theater/raspbian/bullseye ./build/distributions/${{ steps.get_deb.outputs.filename }} + bundle exec package_cloud push yuzawa-san/googolplex-theater/raspbian/bookworm ./build/distributions/${{ steps.get_deb.outputs.filename }} bundle exec package_cloud push yuzawa-san/googolplex-theater/ubuntu/focal ./build/distributions/${{ steps.get_deb.outputs.filename }} - bundle exec package_cloud push yuzawa-san/googolplex-theater/ubuntu/bionic ./build/distributions/${{ steps.get_deb.outputs.filename }} bundle exec package_cloud push yuzawa-san/googolplex-theater/ubuntu/jammy ./build/distributions/${{ steps.get_deb.outputs.filename }} env: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} diff --git a/Dockerfile b/Dockerfile index ee2a3c9..2ec4916 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17-jre-focal +FROM eclipse-temurin:20-jre-jammy WORKDIR /opt/googolplex-theater COPY build/install/googolplex-theater-boot/ . EXPOSE 8000 diff --git a/build.gradle b/build.gradle index 0687355..35f30e4 100644 --- a/build.gradle +++ b/build.gradle @@ -140,7 +140,7 @@ buildDeb { into '/opt/googolplex-theater' user 'googolplex-theater' permissionGroup 'googolplex-theater' - requires("default-jre-headless") + requires("openjdk-17-jre-headless") from("${project.buildDir}/install/googolplex-theater-boot") { exclude 'conf' exclude 'service'