repos / pico

commit

508d0cb

parent

2ae8def

author

Antonio Mika

date

2022-12-11 23:59:25 +0000 UTC

Add caddy step to normal build

 1@@ -13,6 +13,9 @@ on:
 2 
 3 env:
 4   REGISTRY: ghcr.io
 5+  PLATFORM: |
 6+    linux/amd64
 7+    linux/arm64
 8 
 9 jobs:
10   test:
11@@ -74,44 +77,19 @@ jobs:
12         tags: ${{ steps.meta.outputs.tags }}
13         labels: ${{ steps.meta.outputs.labels }}
14         target: release-${{ matrix.target }}
15-        platform: |
16-          linux/amd64
17-          linux/arm64
18+        platform: ${{ env.PLATFORM }}
19         build-args: |
20           APP=${{ matrix.app }}
21-  build-caddy:
22-    runs-on: ubuntu-22.04
23-    needs: test
24-    steps:
25-    - name: Checkout repo
26-      uses: actions/checkout@v3
27-    - name: Set up QEMU
28-      uses: docker/setup-qemu-action@v2
29-      with:
30-        platforms: all
31-    - name: Set up Docker Buildx
32-      id: buildx
33-      uses: docker/setup-buildx-action@v2
34-      with:
35-        version: latest
36-    - name: Login to Docker Hub
37-      uses: docker/login-action@v2
38-      with:
39-        registry: ${{ env.REGISTRY }}
40-        username: ${{ github.actor }}
41-        password: ${{ secrets.GITHUB_TOKEN }}
42-    - name: Collect image metadata
43-      id: meta
44+    - name: Collect Caddy image metadata
45+      id: metacaddy
46       uses: docker/metadata-action@v4
47       with:
48         images: ${{ env.REGISTRY }}/${{ github.repository }}/caddy
49-    - name: Build and push
50+    - name: Build and push Caddy
51       uses: docker/build-push-action@v3
52       with:
53         context: ./caddy
54         push: true
55-        tags: ${{ steps.meta.outputs.tags }}
56-        labels: ${{ steps.meta.outputs.labels }}
57-        platform: |
58-          linux/amd64
59-          linux/arm64
60+        tags: ${{ steps.metacaddy.outputs.tags }}
61+        labels: ${{ steps.metacaddy.outputs.labels }}
62+        platform: ${{ env.PLATFORM }}