Revert "Try to work around buildkit bug"
Should be fixed upstream now
This reverts commit d1d43c42b0.
			
			
This commit is contained in:
		
							parent
							
								
									8ccc3a04d5
								
							
						
					
					
						commit
						611b7a694c
					
				
					 2 changed files with 0 additions and 4 deletions
				
			
		
							
								
								
									
										3
									
								
								.github/workflows/build.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/build.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -24,7 +24,6 @@ jobs:
 | 
				
			||||||
        uses: docker/setup-buildx-action@v1
 | 
					        uses: docker/setup-buildx-action@v1
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          config: .github/buildkit.toml
 | 
					          config: .github/buildkit.toml
 | 
				
			||||||
          driver-opts: image=moby/buildkit:v0.9.1
 | 
					 | 
				
			||||||
      - name: Login to Docker
 | 
					      - name: Login to Docker
 | 
				
			||||||
        uses: docker/login-action@v1
 | 
					        uses: docker/login-action@v1
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
| 
						 | 
					@ -60,7 +59,6 @@ jobs:
 | 
				
			||||||
        uses: docker/setup-buildx-action@v1
 | 
					        uses: docker/setup-buildx-action@v1
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          config: .github/buildkit.toml
 | 
					          config: .github/buildkit.toml
 | 
				
			||||||
          driver-opts: image=moby/buildkit:v0.9.1
 | 
					 | 
				
			||||||
      - name: Login to Docker
 | 
					      - name: Login to Docker
 | 
				
			||||||
        uses: docker/login-action@v1
 | 
					        uses: docker/login-action@v1
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
| 
						 | 
					@ -97,7 +95,6 @@ jobs:
 | 
				
			||||||
        uses: docker/setup-buildx-action@v1
 | 
					        uses: docker/setup-buildx-action@v1
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          config: .github/buildkit.toml
 | 
					          config: .github/buildkit.toml
 | 
				
			||||||
          driver-opts: image=moby/buildkit:v0.9.1
 | 
					 | 
				
			||||||
      - name: Login to Docker
 | 
					      - name: Login to Docker
 | 
				
			||||||
        uses: docker/login-action@v1
 | 
					        uses: docker/login-action@v1
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										1
									
								
								.github/workflows/pr.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/pr.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -26,7 +26,6 @@ jobs:
 | 
				
			||||||
        uses: docker/setup-buildx-action@v1
 | 
					        uses: docker/setup-buildx-action@v1
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          config: .github/buildkit.toml
 | 
					          config: .github/buildkit.toml
 | 
				
			||||||
          driver-opts: image=moby/buildkit:v0.9.1
 | 
					 | 
				
			||||||
      - name: Build Image
 | 
					      - name: Build Image
 | 
				
			||||||
        run: ./makeimage.sh ${{ matrix.target }} ${{ matrix.variant }}
 | 
					        run: ./makeimage.sh ${{ matrix.target }} ${{ matrix.variant }}
 | 
				
			||||||
      - name: Build ffmpeg
 | 
					      - name: Build ffmpeg
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue