Skip to content

Commit efb15a7

Browse files
committed
ci:fix
1 parent 4c30d42 commit efb15a7

3 files changed

Lines changed: 34 additions & 8 deletions

File tree

.github/workflows/cpp-gql.yaml

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,50 @@ jobs:
2929
password: ${{ secrets.DOCKERHUB_TOKEN }}
3030
- name: Set up Docker Buildx
3131
uses: docker/setup-buildx-action@v3
32-
- name: Build gql x86_64
32+
- name: Build gql linux x86_64
3333
uses: docker/build-push-action@v6
3434
with:
3535
file: shared/dockerfiles/gql
3636
push: true
37-
target: scratch
37+
target: gql-scratch
3838
tags: vladimirdev635/gql-linux-x86_64:${{ github.ref_name }}
3939
cache-from: type=registry,ref=vladimirdev635/gql-linux-x86_64:buildcache
4040
cache-to: type=registry,ref=vladimirdev635/gql-linux-x86_64:buildcache,mode=max
4141
provenance: false
4242
sbom: false
43-
- name: Build gql linux/arm64
43+
- name: Build gql linux alpine x86_64
44+
uses: docker/build-push-action@v6
45+
with:
46+
file: shared/dockerfiles/gql
47+
push: true
48+
target: gql-alpine
49+
tags: vladimirdev635/gql-alpine-linux-x86_64:${{ github.ref_name }}
50+
cache-from: type=registry,ref=vladimirdev635/gql-alpine-linux-x86_64:buildcache
51+
cache-to: type=registry,ref=vladimirdev635/gql-alpine-linux-x86_64:buildcache,mode=max
52+
provenance: false
53+
sbom: false
54+
- name: Build gql linux arm64
4455
uses: docker/build-push-action@v6
4556
with:
4657
provenance: false
4758
sbom: false
4859
file: shared/dockerfiles/gql-arm64
4960
push: true
50-
target: scratch
61+
target: gql-scratch
5162
tags: vladimirdev635/gql-linux-arm64:${{ github.ref_name }}
5263
cache-from: type=registry,ref=vladimirdev635/gql-linux-arm64:buildcache
5364
cache-to: type=registry,ref=vladimirdev635/gql-linux-arm64:buildcache,mode=max
65+
- name: Build gql linux alpine arm64
66+
uses: docker/build-push-action@v6
67+
with:
68+
provenance: false
69+
sbom: false
70+
file: shared/dockerfiles/gql-arm64
71+
push: true
72+
target: gql-alpine
73+
tags: vladimirdev635/gql-alpine-linux-arm64:${{ github.ref_name }}
74+
cache-from: type=registry,ref=vladimirdev635/gql-alpine-linux-arm64:buildcache
75+
cache-to: type=registry,ref=vladimirdev635/gql-alpine-linux-arm64:buildcache,mode=max
5476
- name: Build gql darwin/x86_64
5577
uses: docker/build-push-action@v6
5678
with:
@@ -91,6 +113,10 @@ jobs:
91113
docker manifest annotate vladimirdev635/gql:${{ github.ref_name }} \
92114
vladimirdev635/gql-darwin-arm64:${{ github.ref_name }} --os darwin --arch=arm64
93115
docker manifest push vladimirdev635/gql:${{ github.ref_name }}
116+
docker manifest create vladimirdev635/gql-alpine:${{ github.ref_name }} \
117+
vladimirdev635/gql-alpine-linux-x86_64:${{ github.ref_name }} \
118+
vladimirdev635/gql-alpine-linux-arm64:${{ github.ref_name }}
119+
docker manifest push vladimirdev635/gql-alpine:${{ github.ref_name }}
94120
- name: 'Copy all binaries'
95121
run: |
96122
container_id=$(docker create vladimirdev635/gql-darwin-x86_64:${{ github.ref_name }})

shared/dockerfiles/gql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ RUN cmake \
1515
cmake --build build --parallel 4 && \
1616
ctest --rerun-failed --output-on-failure build
1717

18-
FROM alpine:3.22.1 as alpine
18+
FROM alpine:3.22.1 as gql-alpine
1919
COPY --from=builder /usr/local/app/build/bin/gql /gql
2020
CMD ["/gql"]
2121

22-
FROM scratch as scratch
22+
FROM scratch as gql-scratch
2323
COPY --from=builder /usr/local/app/build/bin/gql /gql
2424
CMD ["/gql"]

shared/dockerfiles/gql-arm64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ RUN --mount=type=bind,from=alpine-sysroot,source=/lib/,target=/arm64-sysroot/lib
2222
-B build && \
2323
cmake --build build --parallel 4
2424

25-
FROM --platform=linux/arm64 alpine:3.22.1 as alpine
25+
FROM --platform=linux/arm64 alpine:3.22.1 as gql-alpine
2626
COPY --from=builder /usr/local/app/build/bin/gql /gql
2727
CMD ["/gql"]
2828

29-
FROM --platform=linux/arm64 scratch as scratch
29+
FROM --platform=linux/arm64 scratch as gql-scratch
3030
COPY --from=builder /usr/local/app/build/bin/gql /gql
3131
CMD ["/gql"]

0 commit comments

Comments
 (0)