From 4074b211c71c2d9fd9ec1bfa425134006efa7d7b Mon Sep 17 00:00:00 2001 From: em Date: Sat, 3 Dec 2022 12:34:32 +0100 Subject: [PATCH 1/2] Fix builds, fixes #23 fixes #24 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6650d99..de807db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: context: . platforms: linux/amd64 push: true - target: jodconverter-gui + target: gui tags: | ${{ env.IMAGE_FQDN }}:gui ${{ env.IMAGE_FQDN }}:gui-${{ github.ref_name }} @@ -50,7 +50,7 @@ jobs: context: . platforms: linux/amd64 push: true - target: jodconverter-rest + target: rest tags: | ${{ env.IMAGE_FQDN }}:rest ${{ env.IMAGE_FQDN }}:rest-${{ github.ref_name }} From 1359a242e108a996bad0fe0dad0b9e242e2c389f Mon Sep 17 00:00:00 2001 From: em Date: Sat, 3 Dec 2022 12:44:13 +0100 Subject: [PATCH 2/2] Fix make start script using the wrong images --- makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index eb7140f..86b2443 100644 --- a/makefile +++ b/makefile @@ -4,10 +4,10 @@ build: docker build --target rest . -t ghcr.io/eugenmayer/jodconverter:rest start-gui: stop - docker run --name jodconverter-spring -m 512m --rm -p 8080:8080 eugenmayer/jodconverter:gui + docker run --name jodconverter-spring -m 512m --rm -p 8080:8080 ghcr.io/eugenmayer/jodconverter:gui start-rest: stop - docker run --name jodconverter-rest -m 512m --rm -p 8080:8080 eugenmayer/jodconverter:rest + docker run --name jodconverter-rest -m 512m --rm -p 8080:8080 ghcr.io/eugenmayer/jodconverter:rest stop: docker stop --name jodconverter-rest > /dev/null 2>&1 || true