Don't use deprecated docker action
This commit is contained in:
		
							parent
							
								
									4eb20ade1b
								
							
						
					
					
						commit
						79e97cc7f2
					
				
					 1 changed files with 24 additions and 26 deletions
				
			
		
							
								
								
									
										50
									
								
								.github/workflows/build.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										50
									
								
								.github/workflows/build.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -14,18 +14,17 @@ jobs:
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - name: Checkout
 | 
					      - name: Checkout
 | 
				
			||||||
        uses: actions/checkout@v2
 | 
					        uses: actions/checkout@v2
 | 
				
			||||||
      - name: Pull latest
 | 
					      - name: Login to DockerHub
 | 
				
			||||||
        run: docker pull btbn/ffmpeg-builder:base || true
 | 
					        uses: docker/login-action@v1
 | 
				
			||||||
      - name: Build and push base
 | 
					 | 
				
			||||||
        uses: docker/build-push-action@v1
 | 
					 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          username: ${{ secrets.DOCKER_USER }}
 | 
					          username: ${{ secrets.DOCKER_USER }}
 | 
				
			||||||
          password: ${{ secrets.DOCKER_TOKEN }}
 | 
					          password: ${{ secrets.DOCKER_TOKEN }}
 | 
				
			||||||
          always_pull: true
 | 
					      - name: Pull latest
 | 
				
			||||||
          cache_froms: btbn/ffmpeg-builder:base
 | 
					        run: docker pull btbn/ffmpeg-builder:base || true
 | 
				
			||||||
          repository: btbn/ffmpeg-builder
 | 
					      - name: Build base image
 | 
				
			||||||
          tags: base
 | 
					        run: docker build --pull --cache-from btbn/ffmpeg-builder:base --tag btbn/ffmpeg-builder:base images/base
 | 
				
			||||||
          path: images/base
 | 
					      - name: Push base image
 | 
				
			||||||
 | 
					        run: docker push btbn/ffmpeg-builder:base
 | 
				
			||||||
  build_target_bases:
 | 
					  build_target_bases:
 | 
				
			||||||
    name: Build target base image
 | 
					    name: Build target base image
 | 
				
			||||||
    needs: build_base
 | 
					    needs: build_base
 | 
				
			||||||
| 
						 | 
					@ -37,18 +36,17 @@ jobs:
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - name: Checkout
 | 
					      - name: Checkout
 | 
				
			||||||
        uses: actions/checkout@v2
 | 
					        uses: actions/checkout@v2
 | 
				
			||||||
      - name: Pull latest
 | 
					      - name: Login to DockerHub
 | 
				
			||||||
        run: docker pull btbn/ffmpeg-builder:base-${{ matrix.target }} || true
 | 
					        uses: docker/login-action@v1
 | 
				
			||||||
      - name: Build and push target base
 | 
					 | 
				
			||||||
        uses: docker/build-push-action@v1
 | 
					 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          username: ${{ secrets.DOCKER_USER }}
 | 
					          username: ${{ secrets.DOCKER_USER }}
 | 
				
			||||||
          password: ${{ secrets.DOCKER_TOKEN }}
 | 
					          password: ${{ secrets.DOCKER_TOKEN }}
 | 
				
			||||||
          always_pull: true
 | 
					      - name: Pull latest
 | 
				
			||||||
          cache_froms: btbn/ffmpeg-builder:base-${{ matrix.target }}
 | 
					        run: docker pull btbn/ffmpeg-builder:base-${{ matrix.target }} || true
 | 
				
			||||||
          repository: btbn/ffmpeg-builder
 | 
					      - name: Build target base image
 | 
				
			||||||
          tags: base-${{ matrix.target }}
 | 
					        run: docker build --pull --cache-from btbn/ffmpeg-builder:base-${{ matrix.target }} --tag btbn/ffmpeg-builder:base-${{ matrix.target }} images/base-${{ matrix.target }}
 | 
				
			||||||
          path: images/base-${{ matrix.target }}
 | 
					      - name: Push target base image
 | 
				
			||||||
 | 
					        run: docker push btbn/ffmpeg-builder:base-${{ matrix.target }}
 | 
				
			||||||
  build_targets:
 | 
					  build_targets:
 | 
				
			||||||
    name: Build target-variant image
 | 
					    name: Build target-variant image
 | 
				
			||||||
    needs: build_target_bases
 | 
					    needs: build_target_bases
 | 
				
			||||||
| 
						 | 
					@ -63,17 +61,17 @@ jobs:
 | 
				
			||||||
        uses: actions/checkout@v2
 | 
					        uses: actions/checkout@v2
 | 
				
			||||||
      - name: Generate Dockerfile
 | 
					      - name: Generate Dockerfile
 | 
				
			||||||
        run: ./generate.sh ${{ matrix.target }} ${{ matrix.variant }}
 | 
					        run: ./generate.sh ${{ matrix.target }} ${{ matrix.variant }}
 | 
				
			||||||
      - name: Pull latest
 | 
					      - name: Login to DockerHub
 | 
				
			||||||
        run: docker pull btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }} || true
 | 
					        uses: docker/login-action@v1
 | 
				
			||||||
      - name: Build and push target base
 | 
					 | 
				
			||||||
        uses: docker/build-push-action@v1
 | 
					 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          username: ${{ secrets.DOCKER_USER }}
 | 
					          username: ${{ secrets.DOCKER_USER }}
 | 
				
			||||||
          password: ${{ secrets.DOCKER_TOKEN }}
 | 
					          password: ${{ secrets.DOCKER_TOKEN }}
 | 
				
			||||||
          always_pull: true
 | 
					      - name: Pull latest
 | 
				
			||||||
          cache_froms: btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }}
 | 
					        run: docker pull btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }} || true
 | 
				
			||||||
          repository: btbn/ffmpeg-builder
 | 
					      - name: Build variant image
 | 
				
			||||||
          tags: ${{ matrix.target }}-${{ matrix.variant }}
 | 
					        run: docker build --pull --cache-from btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }} --tag btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }} .
 | 
				
			||||||
 | 
					      - name: Push variant image
 | 
				
			||||||
 | 
					        run: docker push btbn/ffmpeg-builder:${{ matrix.target }}-${{ matrix.variant }}
 | 
				
			||||||
  build_ffmpeg:
 | 
					  build_ffmpeg:
 | 
				
			||||||
    name: Build ffmpeg
 | 
					    name: Build ffmpeg
 | 
				
			||||||
    needs: build_targets
 | 
					    needs: build_targets
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue