fix(docker): update path to CLI jar (#1241)

* chore(docker): add .github/ to .dockerignore

* feat(docker): test container image before pushing

* fix(docker): update path to CLI jar

* fix(cli): return exit code 0 for --help

* chore(docker): add more ancillary trees to .dockerignore

.dockerignore

@@ -1,4 +1,7 @@
 .git/
+.github/
+docs/
 Dockerfile
 build/
 config/
+scripts/

.github/workflows/docker.yml

@@ -105,7 +105,27 @@ jobs:
           echo ::set-output name=version::${AXION_VERSION}
           echo ::set-output name=tags::${DOCKER_TAGS}
           echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-      - name: Build and push
+
+      # Build and push steps are split up in order to test the built contaire image in between
+      # - build-args and labels inputs _must_ be kept matching between both to prevent rebuild
+      # - See: https://github.com/docker/build-push-action/blob/master/docs/advanced/test-before-push.md
+      - name: Build Docker container image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./Dockerfile
+          build-args: |
+            VERSION_TAG=${{ steps.prep.outputs.version }}
+          load: true
+          tags: ${{ steps.prep.outputs.tags }}
+          labels: |
+            org.opencontainers.image.source=https://github.com/${GITHUB_REPOSITORY,,}.git
+            org.opencontainers.image.created=${{ steps.prep.outputs.created }}
+            org.opencontainers.image.revision=${{ github.sha }}
+            org.opencontainers.image.version=${{ steps.prep.outputs.version }}
+      - name: Test Docker container image
+        run: docker run --rm ${{ steps.prep.outputs.tags }} --help
+      - name: Push Docker container image
         uses: docker/build-push-action@v3
         with:
           context: .

Dockerfile

@@ -10,7 +10,7 @@ RUN ./gradlew shadowJar \
 
 
 FROM openjdk:11-slim
-COPY --from=build /build/main/build/libs/gtfs-validator-*-cli.jar /gtfs-validator-cli.jar
+COPY --from=build /build/cli/build/libs/gtfs-validator-*-cli.jar /gtfs-validator-cli.jar
 WORKDIR /
 
 ARG VERSION_TAG

cli/src/main/java/org/mobilitydata/gtfsvalidator/cli/Main.java

@@ -68,7 +68,7 @@ private static Arguments parseArguments(String[] argv) {
       jCommander.usage();
       System.out.println(
           "⚠️ Note that parameters marked with an asterisk (*) in the help menu are mandatory.");
-      return null;
+      System.exit(0);
     }
     if (args.getExportNoticeSchema()) {
       exportNoticeSchema(args);