diff --git a/.github/workflows/main.yml b/.github/workflows/ci.yml similarity index 100% rename from .github/workflows/main.yml rename to .github/workflows/ci.yml diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish-dev.yml similarity index 82% rename from .github/workflows/docker-publish.yml rename to .github/workflows/docker-publish-dev.yml index 7122b96f..b777f1da 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish-dev.yml @@ -1,10 +1,10 @@ -name: Publish branch Docker +name: publish dev image docker on: push: branches: - - master - - develop - + - '*' + - '*/*' + - '!master' jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/docker-publish-latest.yml b/.github/workflows/docker-publish-latest.yml new file mode 100644 index 00000000..d71f2ff6 --- /dev/null +++ b/.github/workflows/docker-publish-latest.yml @@ -0,0 +1,19 @@ +name: publish latest image docker +on: + push: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Build and publish image + uses: ilteoood/docker_buildx@master + with: + publish: true + imageName: vabene1111/recipes + tag: latest + dockerHubUser: ${{ secrets.DOCKER_USERNAME }} + dockerHubPassword: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/docker-release-publish.yml b/.github/workflows/docker-publish-release.yml similarity index 89% rename from .github/workflows/docker-release-publish.yml rename to .github/workflows/docker-publish-release.yml index 90b672a7..eee5088b 100644 --- a/.github/workflows/docker-release-publish.yml +++ b/.github/workflows/docker-publish-release.yml @@ -1,4 +1,4 @@ -name: Release DockerHub Version +name: publish tagged release docker on: push: @@ -20,7 +20,6 @@ jobs: with: publish: true imageName: vabene1111/recipes - platform: linux/amd64,linux/arm64 tag: ${{ steps.get_version.outputs.VERSION }} dockerHubUser: ${{ secrets.DOCKER_USERNAME }} dockerHubPassword: ${{ secrets.DOCKER_PASSWORD }}