From b41266f969ecd137efaec0651facd00df00c0f42 Mon Sep 17 00:00:00 2001 From: Kiran Shila Date: Tue, 21 Sep 2021 18:22:32 -0700 Subject: [PATCH] Switch to Java 16, make docker context contain only jar --- .dockerignore | 6 ------ .github/workflows/main.yml | 10 ++++++---- Dockerfile => docker/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 .dockerignore rename Dockerfile => docker/Dockerfile (88%) diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index a523df9..0000000 --- a/.dockerignore +++ /dev/null @@ -1,6 +0,0 @@ -.github/ -logos/ -screenshots/ -.gitignore -LICENSE -README.md diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5f6733a..9eae5d0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,16 +20,18 @@ jobs: uses: actions/setup-java@v2 with: distribution: "adopt" - java-version: "11" + java-version: "16" - name: Install clojure tools uses: DeLaGuardo/setup-clojure@3.5 with: cli: 1.10.3.943 - - name: Build bot - run: clojure -T:build uber + - name: Build bot and copy out jar for docker shell: bash + run: | + clojure -T:build uber + cp target/doplarr.jar docker - name: Release tagged version uses: softprops/action-gh-release@v1 @@ -56,7 +58,7 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v2 with: - context: . + context: docker push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/docker/Dockerfile similarity index 88% rename from Dockerfile rename to docker/Dockerfile index d124265..a6adf34 100644 --- a/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11:alpine-jre +FROM adoptopenjdk/openjdk16:alpine-jre WORKDIR /app