diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 465ef30..9a4ef34 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -7,6 +7,9 @@ on: paths: - "Dockerfile" - "**/*.R" + pull_request: + branches: + - main jobs: build-and-push: @@ -38,7 +41,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: .devcontainer/Dockerfile.R + file: Dockerfile tags: | ghcr.io/${{ github.repository_owner }}/${{ env.PACKAGE }}:${{ env.VERSION }} ghcr.io/${{ github.repository_owner }}/${{ env.PACKAGE }}:latest @@ -71,5 +74,6 @@ jobs: - name: Run Container Tests run: - docker run --rm ghcr.io/${{ github.repository_owner }}/${{ env.PACKAGE - }}:${{env.VERSION }} R -e "devtools::test()" + docker run --rm --entrypoint "R" ghcr.io/${{ github.repository_owner + }}/${{ env.PACKAGE }}:${{env.VERSION }} -e + "library(biodiversityhorizons)"