update deploy GH action

sdr-enthusiasts · Oct 22, 2023 · f15d794 · f15d794
1 parent b12e7bd
commit f15d794
Showing 1 changed file with 3 additions and 27 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -63,10 +63,10 @@ jobs:
       - name: Pull hadolint/hadolint:latest Image
         run: docker pull hadolint/hadolint:latest
       - name: Run hadolint against Dockerfiles
-        run: docker run --rm -i -v "$PWD":/workdir --workdir /workdir --entrypoint hadolint hadolint/hadolint --ignore DL3015 --ignore DL3003 --ignore DL3006 --ignore DL3010 --ignore DL4001 --ignore DL3007 --ignore DL3008 --ignore SC2068 --ignore DL3007 --ignore SC1091 --ignore DL3013 --ignore DL3010 $(find . -type f -iname "Dockerfile*")
+        run: docker run --rm -i -v "$PWD":/workdir --workdir /workdir --entrypoint hadolint hadolint/hadolint --ignore DL3015 --ignore DL3003 --ignore DL3006 --ignore DL3010 --ignore DL4001 --ignore DL3007 --ignore DL3008 --ignore SC2068 --ignore DL3007 --ignore SC1091 --ignore DL3013 --ignore DL3010 --ignore SC3054 $(find . -type f -iname "Dockerfile*")
 
   deploy:
-    name: Deploy without telegraf
+    name: Deploy
     uses: sdr-enthusiasts/common-github-workflows/.github/workflows/build_and_push_image.yml@main
     with:
       push_enabled: true
@@ -81,33 +81,9 @@ jobs:
       build_version_specific: false
       build_platform_specific: false
       build_nohealthcheck: false
-      build_baseimage_url: docker-tar1090:latest/docker-tar1090:baseimage-test
+      # build_baseimage_url: 
     secrets:
       ghcr_token: ${{ secrets.GITHUB_TOKEN }}
 
   # unfortunately we can't use build_and_push_image.yml to build the telegraf label because
   # that GH Action doesn't have the capability to build specific custom-named labels
-
-  deploy_with_telegraf:
-    name: Deploy with telegraf and healthcheck
-    uses: sdr-enthusiasts/common-github-workflows/.github/workflows/build_and_push_image.yml@main
-    with:
-      push_enabled: true
-      push_destinations: ghcr.io
-      ghcr_repo_owner: ${{ github.repository_owner }}
-      ghcr_repo: ${{ github.repository }}
-      get_version_method: file_in_container:file=/CONTAINER_VERSION
-      # set build_latest to true if github.event.inputs.use_test_image is false
-      build_latest: ${{ github.event.inputs.use_test_image == 'false' || github.event.inputs.use_test_image == ''  }}
-      build_baseimage_test: ${{ github.event.inputs.use_test_image == 'true' }}
-      build_baseimage_url: docker-tar1090:telegraf/docker-tar1090:telegraf-baseimage-test
-      # only build the entire stack if we are not using the test image
-      build_version_specific: false
-      build_platform_specific: false
-      build_nohealthcheck: false
-      docker_latest_tag: telegraf
-      dockerfile_changes: |
-        docker-tar1090:latest/docker-tar1090:telegraf
-
-    secrets:
-      ghcr_token: ${{ secrets.GITHUB_TOKEN }}