diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index da134a79..c41d70b5 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -7,11 +7,17 @@ jobs: docker: name: Docker Build runs-on: ubuntu-latest - needs: build - steps: + steps: - name: Checkout uses: actions/checkout@v4 + - name: Extract version from Cargo.toml + id: cargo-version + run: | + VERSION=$(grep -m1 "^version" Cargo.toml | cut -d'"' -f2) + echo "VERSION=$VERSION" >> $GITHUB_ENV + echo "version=$VERSION" >> $GITHUB_OUTPUT + - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -33,4 +39,5 @@ jobs: push: true tags: | ghcr.io/${{ github.repository }}:latest + ghcr.io/${{ github.repository }}:${{ env.VERSION }} ghcr.io/${{ github.repository }}:${{ github.sha }} diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 4d5b36ee..f89dbbe4 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -324,33 +324,3 @@ jobs: name: msi-${{ matrix.arch }} path: artifacts/ if-no-files-found: error - docker: - name: Docker Build - runs-on: ubuntu-latest - needs: build - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v5 - with: - context: . - platforms: linux/amd64,linux/arm64,linux/386,linux/arm/v7 - push: true - tags: | - ghcr.io/${{ github.repository }}:latest - ghcr.io/${{ github.repository }}:${{ github.sha }} diff --git a/README.md b/README.md index 058b7094..5fc8bf7f 100644 --- a/README.md +++ b/README.md @@ -322,7 +322,7 @@ ### Rendering problems ICED_BACKEND=tiny-skia ``` -### _**In any case, don't hesitate to [open an issue](https://github.com/GyulyVGC/sniffnet/issues/new/choose), and I will do my best to help you!**_ +### ***In any case, don't hesitate to [open an issue](https://github.com/GyulyVGC/sniffnet/issues/new/choose), and I will do my best to help you!***