Merge pull request #2773 from blacklanternsecurity/better-install-deps

Fix docker publishing?

Author: TheTechromancer

.github/workflows/tests.yml

@@ -84,43 +84,63 @@ jobs:
           password: ${{ secrets.PYPI_API_TOKEN }}
       - name: Get BBOT version
         id: version
-        run: echo "BBOT_VERSION=$(poetry version | cut -d' ' -f2)" >> $GITHUB_OUTPUT
+        run: |
+          FULL_VERSION=$(poetry version | cut -d' ' -f2)
+          echo "BBOT_VERSION=$FULL_VERSION" >> $GITHUB_OUTPUT
+          # Extract major.minor (e.g., 2.7 from 2.7.1)
+          MAJOR_MINOR=$(echo "$FULL_VERSION" | cut -d'.' -f1-2)
+          echo "BBOT_VERSION_MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_OUTPUT
+          # Extract major (e.g., 2 from 2.7.1)
+          MAJOR=$(echo "$FULL_VERSION" | cut -d'.' -f1)
+          echo "BBOT_VERSION_MAJOR=$MAJOR" >> $GITHUB_OUTPUT
       - name: Publish to Docker Hub (dev)
         if: github.event_name == 'push' && github.ref == 'refs/heads/dev'
         uses: docker/build-push-action@v6
         with:
           push: true
+          context: .
           tags: |
             blacklanternsecurity/bbot:latest
             blacklanternsecurity/bbot:dev
             blacklanternsecurity/bbot:${{ steps.version.outputs.BBOT_VERSION }}
+            blacklanternsecurity/bbot:${{ steps.version.outputs.BBOT_VERSION_MAJOR_MINOR }}
+            blacklanternsecurity/bbot:${{ steps.version.outputs.BBOT_VERSION_MAJOR }}
       - name: Publish to Docker Hub (stable)
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
         uses: docker/build-push-action@v6
         with:
           push: true
+          context: .
           tags: |
             blacklanternsecurity/bbot:stable
             blacklanternsecurity/bbot:${{ steps.version.outputs.BBOT_VERSION }}
+            blacklanternsecurity/bbot:${{ steps.version.outputs.BBOT_VERSION_MAJOR_MINOR }}
+            blacklanternsecurity/bbot:${{ steps.version.outputs.BBOT_VERSION_MAJOR }}
       - name: Publish Full Docker Image to Docker Hub (dev)
         if: github.event_name == 'push' && github.ref == 'refs/heads/dev'
         uses: docker/build-push-action@v6
         with:
           push: true
           file: Dockerfile.full
+          context: .
           tags: |
             blacklanternsecurity/bbot:latest-full
             blacklanternsecurity/bbot:dev-full
             blacklanternsecurity/bbot:${{ steps.version.outputs.BBOT_VERSION }}-full
+            blacklanternsecurity/bbot:${{ steps.version.outputs.BBOT_VERSION_MAJOR_MINOR }}-full
+            blacklanternsecurity/bbot:${{ steps.version.outputs.BBOT_VERSION_MAJOR }}-full
       - name: Publish Full Docker Image to Docker Hub (stable)
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
         uses: docker/build-push-action@v6
         with:
           push: true
           file: Dockerfile.full
+          context: .
           tags: |
             blacklanternsecurity/bbot:stable-full
             blacklanternsecurity/bbot:${{ steps.version.outputs.BBOT_VERSION }}-full
+            blacklanternsecurity/bbot:${{ steps.version.outputs.BBOT_VERSION_MAJOR_MINOR }}-full
+            blacklanternsecurity/bbot:${{ steps.version.outputs.BBOT_VERSION_MAJOR }}-full
       - name: Docker Hub Description
         if: github.event_name == 'push' && github.ref == 'refs/heads/dev'
         uses: peter-evans/dockerhub-description@v5