Our changes on top of upstream buildkit (review view)

.github/workflows/.test.yml

@@ -96,6 +96,7 @@ jobs:
         name: Build
         uses: docker/bake-action@82490499d2e5613fcead7e128237ef0b0ea210f7 # v7.0.0
         with:
+          provenance: false
           targets: integration-tests-base
           set: |
             *.cache-from=type=gha,scope=${{ inputs.cache_scope }}
@@ -165,6 +166,7 @@ jobs:
         name: Build test image
         uses: docker/bake-action@82490499d2e5613fcead7e128237ef0b0ea210f7 # v7.0.0
         with:
+          provenance: false
           targets: integration-tests
           set: |
             *.cache-from=type=gha,scope=${{ inputs.cache_scope }}
@@ -180,8 +182,9 @@ jobs:
           TEST_REPORT_SUFFIX: -${{ env.TEST_REPORT_NAME }}
           TEST_COVERAGE: 1
           TESTPKGS: ${{ matrix.pkg }}
-          SKIP_INTEGRATION_TESTS: ${{ matrix.skip-integration-tests }}
-          CACHE_FROM: type=gha,scope=${{ inputs.cache_scope }}
+          SKIP_INTEGRATION_TESTS: 1
+          # TODO(jhorsts): errors with HTTP 400
+          # CACHE_FROM: type=gha,scope=${{ inputs.cache_scope }}
       -
         name: Send to Codecov
         if: always()

.github/workflows/buildkit.yml

@@ -183,7 +183,7 @@ jobs:
             const defaultBase = core.getInput('default-base');
             const ref = core.getInput('ref');
             const imageName = core.getInput('image-name');
-            
+
             function getTagSuffixAndLatest(base, target) {
               let tagSuffix = '';
               if (target) {
@@ -204,20 +204,20 @@ jobs:
               }
               return { tagSuffix, tagLatest };
             }
-            
+
             const matrix = [
               { base: 'alpine' },
               { base: 'alpine', target: 'rootless'},
               { base: 'ubuntu', buildTags: 'nvidia venus' }
             ]
-            
+
             for (const entry of matrix) {
               const { tagSuffix, tagLatest } = getTagSuffixAndLatest(entry.base, entry.target);
               entry.imageName = imageName;
               entry.tagSuffix = tagSuffix;
               entry.tagLatest = tagLatest;
             }
-            
+
             core.info(JSON.stringify(matrix, null, 2));
             core.setOutput('includes', JSON.stringify(matrix));
 
@@ -311,7 +311,7 @@ jobs:
         name: Login to DockerHub
         uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Scout

.github/workflows/buildx-image.yml

@@ -58,7 +58,7 @@ jobs:
         if: github.event.inputs.dry-run != 'true'
         uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Create

.github/workflows/dockerd.yml

@@ -133,7 +133,8 @@ jobs:
           TESTPKGS: "${{ matrix.pkg }}"
           TESTFLAGS: "${{ env.TESTFLAGS }} --run=//worker=${{ matrix.worker }}$"
           SKIP_INTEGRATION_TESTS: "${{ matrix.skip-integration-tests }}"
-          CACHE_FROM: "type=gha,scope=build-integration-tests"
+          # TODO(jhorsts): replace with upstream
+          # CACHE_FROM: "type=gha,scope=build-integration-tests"
           BUILDKIT_INTEGRATION_DOCKERD_FLAGS: |
             --bip=10.66.66.1/24
             --default-address-pool=base=10.66.66.0/16,size=24

.github/workflows/earthly-count.yml

@@ -0,0 +1,185 @@
+name: Track Earthly to Earthbuild Progress
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  count-earthly:
+    runs-on: ubuntu-24.04-arm
+    permissions:
+      contents: read
+      pull-requests: write
+
+    steps:
+      - name: Checkout PR branch
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+        with:
+          fetch-depth: 0
+
+      - name: Count occurrences in PR branch
+        id: count_pr
+        run: |
+          # Count total occurrences
+          total_count=$(git grep -i "earthly" -- ':!.github/workflows/earthly-count.yml' 2>/dev/null | wc -l || echo "0")
+          echo "total_count=$total_count" >> $GITHUB_OUTPUT
+
+          # Count by file type
+          go_count=$(git grep -i "earthly" -- "*.go" 2>/dev/null | wc -l || echo "0")
+          md_count=$(git grep -i "earthly" -- "*.md" 2>/dev/null | wc -l || echo "0")
+          earthfile_count=$(($(git grep -i "earthly" -- "Earthfile" 2>/dev/null | wc -l || echo "0") + $(git grep -i "earthly" -- "*.earth" 2>/dev/null | wc -l || echo "0")))
+
+          echo "go_count=$go_count" >> $GITHUB_OUTPUT
+          echo "md_count=$md_count" >> $GITHUB_OUTPUT
+          echo "earthfile_count=$earthfile_count" >> $GITHUB_OUTPUT
+
+          echo "PR branch - Total: $total_count (Go: $go_count, MD: $md_count, Earthfiles: $earthfile_count)"
+
+      - name: Checkout main branch
+        run: |
+          git checkout origin/main
+
+      - name: Count occurrences in main branch
+        id: count_main
+        run: |
+          # Count total occurrences
+          total_count=$(git grep -i "earthly" -- ':!.github/workflows/earthly-count.yml' 2>/dev/null | wc -l || echo "0")
+          echo "main_total_count=$total_count" >> $GITHUB_OUTPUT
+
+          # Count by file type
+          go_count=$(git grep -i "earthly" -- "*.go" 2>/dev/null | wc -l || echo "0")
+          md_count=$(git grep -i "earthly" -- "*.md" 2>/dev/null | wc -l || echo "0")
+          earthfile_count=$(($(git grep -i "earthly" -- "Earthfile" 2>/dev/null | wc -l || echo "0") + $(git grep -i "earthly" -- "*.earth" 2>/dev/null | wc -l || echo "0")))
+
+          echo "main_go_count=$go_count" >> $GITHUB_OUTPUT
+          echo "main_md_count=$md_count" >> $GITHUB_OUTPUT
+          echo "main_earthfile_count=$earthfile_count" >> $GITHUB_OUTPUT
+
+          echo "Main branch - Total: $total_count (Go: $go_count, MD: $md_count, Earthfiles: $earthfile_count)"
+
+      - name: Calculate difference
+        id: calculate
+        run: |
+          pr_count=${{ steps.count_pr.outputs.total_count }}
+          main_count=${{ steps.count_main.outputs.main_total_count }}
+          difference=$((main_count - pr_count))
+
+          # Calculate percentage with proper formatting
+          if [ $main_count -gt 0 ]; then
+            # Use awk for better decimal handling
+            percentage=$(awk "BEGIN {printf \"%.2f\", $difference * 100 / $main_count}")
+          else
+            percentage="0.00"
+          fi
+
+          echo "difference=$difference" >> $GITHUB_OUTPUT
+          echo "percentage=$percentage" >> $GITHUB_OUTPUT
+          echo "pr_count=$pr_count" >> $GITHUB_OUTPUT
+          echo "main_count=$main_count" >> $GITHUB_OUTPUT
+
+          # Calculate differences by type
+          go_diff=$((${{ steps.count_main.outputs.main_go_count }} - ${{ steps.count_pr.outputs.go_count }}))
+          md_diff=$((${{ steps.count_main.outputs.main_md_count }} - ${{ steps.count_pr.outputs.md_count }}))
+          earthfile_diff=$((${{ steps.count_main.outputs.main_earthfile_count }} - ${{ steps.count_pr.outputs.earthfile_count }}))
+
+          echo "go_diff=$go_diff" >> $GITHUB_OUTPUT
+          echo "md_diff=$md_diff" >> $GITHUB_OUTPUT
+          echo "earthfile_diff=$earthfile_diff" >> $GITHUB_OUTPUT
+
+      - name: Comment on PR
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd  # v8.0.0
+        with:
+          script: |
+            const prCount = ${{ steps.calculate.outputs.pr_count }};
+            const mainCount = ${{ steps.calculate.outputs.main_count }};
+            const difference = ${{ steps.calculate.outputs.difference }};
+            const percentage = '${{ steps.calculate.outputs.percentage }}';
+
+            // File type differences
+            const goDiff = ${{ steps.calculate.outputs.go_diff }};
+            const mdDiff = ${{ steps.calculate.outputs.md_diff }};
+            const earthfileDiff = ${{ steps.calculate.outputs.earthfile_diff }};
+
+            let emoji = '📊';
+            let message = '';
+
+            if (difference > 0) {
+              emoji = '🎉';
+              message = `Great progress! You've reduced "earthly" occurrences by **${difference}** (${percentage}%)`;
+            } else if (difference < 0) {
+              emoji = '⚠️';
+              message = `Warning: "earthly" occurrences have increased by **${Math.abs(difference)}** (${Math.abs(parseFloat(percentage))}%)`;
+            } else {
+              emoji = '➖';
+              message = 'No change in "earthly" occurrences';
+            }
+
+            // Build detailed breakdown
+            let breakdown = '';
+            if (goDiff !== 0 || mdDiff !== 0 || earthfileDiff !== 0) {
+              breakdown = `
+
+            ### 📁 Changes by file type:
+            | File Type | Change |
+            |-----------|--------|
+            | Go files (.go) | ${goDiff > 0 ? '✅ -' + goDiff : goDiff < 0 ? '❌ +' + Math.abs(goDiff) : '➖ No change'} |
+            | Documentation (.md) | ${mdDiff > 0 ? '✅ -' + mdDiff : mdDiff < 0 ? '❌ +' + Math.abs(mdDiff) : '➖ No change'} |
+            | Earthfiles | ${earthfileDiff > 0 ? '✅ -' + earthfileDiff : earthfileDiff < 0 ? '❌ +' + Math.abs(earthfileDiff) : '➖ No change'} |`;
+            }
+
+            const body = `## ${emoji} Are we earthbuild yet?
+
+            ${message}
+
+            ### 📈 Overall Progress
+            | Branch | Total Count |
+            |--------|-------------|
+            | main   | ${mainCount} |
+            | This PR | ${prCount} |
+            | **Difference** | **${difference > 0 ? '-' : '+'}${Math.abs(difference)}** ${difference !== 0 ? `(${Math.abs(parseFloat(percentage))}%)` : ''} |
+            ${breakdown}
+
+            ---
+            *Keep up the great work migrating from Earthly to Earthbuild!* 🚀
+
+            <details>
+            <summary>💡 Tips for finding more occurrences</summary>
+
+            Run locally to see detailed breakdown:
+            \`\`\`bash
+            ./.github/scripts/count-earthly.sh
+            \`\`\`
+
+            **Note that the goal is not to reach 0.**
+            There is anticipated to be at least _some_ occurences of \`earthly\` in the source code due to backwards compatibility with config files and language constructs.
+            </details>`;
+
+            // Find existing comment
+            const { data: comments } = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+            });
+
+            const botComment = comments.find(comment =>
+              comment.user.type === 'Bot' &&
+              comment.body.includes('Are we earthbuild yet?')
+            );
+
+            if (botComment) {
+              // Update existing comment
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: botComment.id,
+                body: body
+              });
+            } else {
+              // Create new comment
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                body: body
+              });
+            }

.github/workflows/frontend.yml

@@ -36,7 +36,6 @@ jobs:
       pkgs: ./frontend/dockerfile
       kinds: |
         integration
-        dockerfile
       codecov_flags: dockerfile-frontend
     secrets:
       codecov_token: ${{ secrets.CODECOV_TOKEN }}
@@ -211,7 +210,7 @@ jobs:
         name: Login to DockerHub
         uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Scout

Dockerfile

@@ -72,6 +72,7 @@ ENV GOFLAGS=-mod=vendor
 # buildkit-version builds stage with version/revision info
 FROM buildkit-base AS buildkit-version
 # TODO: PKG should be inferred from go modules
+ARG RELEASE_VERSION=v0.0.0+earthlyunknown
 RUN --mount=target=. <<'EOT'
   # if git is worktree (file starting with gitdir:) then skip verions check
   if [ -f .git ] && head -1 .git | grep -q "^gitdir:"; then
@@ -87,9 +88,9 @@ RUN --mount=target=. <<'EOT'
     exit 1
   fi
   set -ex
-  export PKG=github.com/moby/buildkit VERSION=$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags) REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) COMMIT_DATE=$(git show -s --format=%cI HEAD);
-  echo "-X ${PKG}/version.Version=${VERSION} -X ${PKG}/version.Revision=${REVISION} -X ${PKG}/version.Package=${PKG}" > /tmp/.ldflags;
-  echo -n "${VERSION}" > /tmp/.version;
+  export PKG=github.com/moby/buildkit EARTHLY_PKG=github.com/EarthBuild/buildkit VERSION=$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags) REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) COMMIT_DATE=$(git show -s --format=%cI HEAD);
+  echo "-X ${PKG}/version.Version=${RELEASE_VERSION} -X ${PKG}/version.Revision=${REVISION} -X ${PKG}/version.Package=${EARTHLY_PKG}" > /tmp/.ldflags;
+  echo -n "${RELEASE_VERSION}" > /tmp/.version;
   echo -n "${COMMIT_DATE}" > /tmp/.commit_date;
 EOT
 

Earthfile

@@ -0,0 +1,14 @@
+
+VERSION 0.6
+
+FROM alpine:3.13
+WORKDIR /buildkit
+
+# build buildkit image
+build:
+    ARG RELEASE_VERSION=v0.0.0+earthlyunknown
+    FROM DOCKERFILE --build-arg RELEASE_VERSION=$RELEASE_VERSION --target buildkit-linux .
+
+code:
+    COPY . .
+    SAVE ARTIFACT /buildkit