updated docker build process
Signed-off-by: Roger Sikorski <roger@sikorski.cloud>
This commit is contained in:
		@@ -6,7 +6,7 @@ on:
 | 
				
			|||||||
      - main
 | 
					      - main
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  Ddockerfile lint:
 | 
					  Dockerfile lint:
 | 
				
			||||||
    runs-on: k3s
 | 
					    runs-on: k3s
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - uses: actions/checkout@v3
 | 
					      - uses: actions/checkout@v3
 | 
				
			||||||
@@ -15,19 +15,17 @@ jobs:
 | 
				
			|||||||
          dockerfile: Dockerfile
 | 
					          dockerfile: Dockerfile
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  build:
 | 
					  build:
 | 
				
			||||||
 | 
					    needs: Dockerfile lint
 | 
				
			||||||
    runs-on: docker
 | 
					    runs-on: docker
 | 
				
			||||||
    needs: "Dockerfile lint"
 | 
					 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - uses: actions/checkout@v3
 | 
					      - uses: actions/checkout@v3
 | 
				
			||||||
      - name: docker login
 | 
					 | 
				
			||||||
        run: docker login gitea.sikorski.cloud -u rogersik -p $ROGERSIK_REGISTRY_TOKEN
 | 
					 | 
				
			||||||
      - name: Pull Docker Image for caching
 | 
					      - name: Pull Docker Image for caching
 | 
				
			||||||
        run: docker pull gitea.sikorski.cloud/rogersik/docker-monica:development || exit 0
 | 
					        run: docker pull gitea.sikorski.cloud/rogersik/monica:development || exit 0
 | 
				
			||||||
      - name: Build the Docker image
 | 
					      - name: Build docker image
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          docker build . \
 | 
					          docker build . \
 | 
				
			||||||
            --cache-from gitea.sikorski.cloud/rogersik/docker-monica:development \
 | 
					            --cache-from gitea.sikorski.cloud/rogersik/monica:development \
 | 
				
			||||||
            --file Dockerfile \
 | 
					            --file Dockerfile \
 | 
				
			||||||
            --tag gitea.sikorski.cloud/rogersik/docker-monica:development
 | 
					            --tag gitea.sikorski.cloud/rogersik/monica:development
 | 
				
			||||||
      - name: Push the Docker image
 | 
					      - name: Push docker image
 | 
				
			||||||
        run: docker push gitea.sikorski.cloud/rogersik/docker-monica --all-tags
 | 
					        run: docker push gitea.sikorski.cloud/rogersik/monica:development
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,7 +8,7 @@ on:
 | 
				
			|||||||
    - cron: "0 6 * * SUN"
 | 
					    - cron: "0 6 * * SUN"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  Ddockerfile lint:
 | 
					  Dockerfile lint:
 | 
				
			||||||
    runs-on: k3s
 | 
					    runs-on: k3s
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - uses: actions/checkout@v3
 | 
					      - uses: actions/checkout@v3
 | 
				
			||||||
@@ -17,18 +17,17 @@ jobs:
 | 
				
			|||||||
          dockerfile: Dockerfile
 | 
					          dockerfile: Dockerfile
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  build:
 | 
					  build:
 | 
				
			||||||
 | 
					    needs: Dockerfile lint
 | 
				
			||||||
    runs-on: docker
 | 
					    runs-on: docker
 | 
				
			||||||
    needs: "Dockerfile lint"
 | 
					 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - uses: actions/checkout@v3
 | 
					      - uses: actions/checkout@v3
 | 
				
			||||||
      - name: Pull Docker Image for caching
 | 
					      - name: Pull Docker Image for caching
 | 
				
			||||||
        run: docker pull gitea.sikorski.cloud/rogersik/docker-monica:latest
 | 
					        run: docker pull gitea.sikorski.cloud/rogersik/monica:development || exit 0
 | 
				
			||||||
      - name: Build the Docker image
 | 
					      - name: Build docker image
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          docker build . \
 | 
					          docker build . \
 | 
				
			||||||
            --cache-from gitea.sikorski.cloud/rogersik/docker-monica:latest \
 | 
					            --cache-from gitea.sikorski.cloud/rogersik/monica:development \
 | 
				
			||||||
            --file Dockerfile \
 | 
					            --file Dockerfile \
 | 
				
			||||||
            --tag gitea.sikorski.cloud/rogersik/docker-monica:latest \
 | 
					            --tag gitea.sikorski.cloud/rogersik/monica:development
 | 
				
			||||||
            --tag gitea.sikorski.cloud/rogersik/docker-monica:4
 | 
					      - name: Push docker image
 | 
				
			||||||
      - name: Push the Docker image
 | 
					        run: docker push gitea.sikorski.cloud/rogersik/monica:development
 | 
				
			||||||
        run: docker push gitea.sikorski.cloud/rogersik/docker-monica --all-tags
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user