diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a40a82e..f0f035c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,6 +3,8 @@ name: docker on: push: branches: [ master ] + tags: + - v.* pull_request: branches: [ master ] @@ -57,7 +59,7 @@ jobs: file: ./Inotify/Dockerfile platforms: linux/amd64 push: true - tags: ${{ secrets.DOCKERHUB_TAG }}:master + tags: ${{ secrets.DOCKERHUB_TAG }}:${{ github.ref }} - name: 'Report Suecss' run: curl ${{ secrets.INOTIFY }}/Inotify/dockerBuildComplated! diff --git a/.github/workflows/dockerTags.yml b/.github/workflows/dockerTags.yml deleted file mode 100644 index 532c875..0000000 --- a/.github/workflows/dockerTags.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: dockerTags - -on: - push: - tags: - - 'v*' - -jobs: - build: - runs-on: ubuntu-latest - steps: - - - name: Check out the repo - uses: actions/checkout@v2 - - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Cache node modules NPM - uses: actions/cache@v2 - env: - cache-name: cache-node-modules-NPM - with: - path: ~/.npm - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./Inotify.Vue/package.json') }} - restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./Inotify.Vue/package.json') }} - - - name: Cache node modules - uses: actions/cache@v2 - env: - cache-name: cache-node-modules - with: - path: ./Inotify.Vue/node_modules - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./Inotify.Vue/package.json') }} - restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./Inotify.Vue/package.json') }} - - - name: InstallNode and BuildVue - run: | - cd ./Inotify.Vue - npm install - npm run build:prod - - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - - name: Docker Build & Push to Docker Hub For tag - uses: docker/build-push-action@v2 - with: - context: . - file: ./Inotify/Dockerfile - platforms: linux/amd64 - push: true - tags: ${{ secrets.DOCKERHUB_TAG }}:${{ github.ref }} - - - name: 'Report Suecss' - run: curl ${{ secrets.INOTIFY }}/Inotify/dockerBuildComplated!