Skip to content

Commit

Permalink
Merge pull request #724 from dgarijo/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
dgarijo authored Aug 13, 2024
2 parents e94c77e + a5ab895 commit fec66b8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Build and push
uses: docker/build-push-action@v6.5.0
uses: docker/build-push-action@v6.6.1
with:
push: ${{ github.event_name != 'pull_request' && github.actor != 'dependabot[bot]' }}
tags: ${{ steps.meta.outputs.tags }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ----
FROM maven:3.8.3-openjdk-17-slim AS BUILD_IMAGE
FROM maven:3.8.3-openjdk-17-slim AS build_image

WORKDIR /var/build/widoco

Expand All @@ -22,6 +22,6 @@ USER widoco

WORKDIR /usr/local/widoco

COPY --from=BUILD_IMAGE /var/build/widoco/JAR/widoco.jar .
COPY --from=build_image /var/build/widoco/JAR/widoco.jar .

ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar widoco.jar ${0} ${@}"]

0 comments on commit fec66b8

Please sign in to comment.