diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2fdcdc5..f7804a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,13 +35,14 @@ jobs: run: | echo "last_tag=${{ steps._tmp_last_tag.outputs.value }}" >> $GITHUB_OUTPUT - test: + run_test: needs: [ vars ] - name: Run test - uses: ./.github/workflows/test.yaml + name: Run workflow - test + uses: text-adi/workflows/.github/workflows/test-docker-files.yaml@dev + build-and-push: - needs: [ vars, test ] + needs: [ vars, run_test ] name: Build runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml deleted file mode 100644 index 43401ca..0000000 --- a/.github/workflows/test.yaml +++ /dev/null @@ -1,31 +0,0 @@ -name: Test - -on: - push: - paths: - - '.github/workflows/test.yml' - workflow_dispatch: - workflow_call: - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.workflow_call.workflow_file }} - cancel-in-progress: true - - -jobs: - lint-dockerfile: - name: Test dockerfile - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Check - run: | - docker run --rm -i -v ./hadolint.yaml:/.config/hadolint.yaml ghcr.io/hadolint/hadolint < Dockerfile - - lint-entrypoint: - name: Test bash script - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Check - uses: ludeeus/action-shellcheck@master \ No newline at end of file diff --git a/entrypoint/docker-entrypoint.sh b/entrypoint/docker-entrypoint.sh index e6b7bd2..8640e80 100644 --- a/entrypoint/docker-entrypoint.sh +++ b/entrypoint/docker-entrypoint.sh @@ -8,7 +8,7 @@ echo "Starting..." for file in /entrypoint.d/*; do if [ -f "$file" ]; then - if [ -n "${DEBUG}" ]; then + if [ -n "${DEBUG}" ]; then echo "** Execute - $file **" fi