updating to tag latgest, collapsing services

defstream · Jan 23, 2023 · c44543c · c44543c
1 parent 60cac99
commit c44543c
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 48 deletions.
diff --git a/.github/workflows/release_docker_hub.yml b/.github/workflows/release_docker_hub.yml
@@ -50,15 +50,4 @@ jobs:
 
       - name: build dockerhub services
         run: |
-          earthly --use-inline-cache --push +axum --VERSION="$VERSION" --REPOSITORY="kickable"
-          earthly --use-inline-cache --push +gotham --VERSION="$VERSION" --REPOSITORY="kickable"
-          earthly --use-inline-cache --push +graphul --VERSION="$VERSION" --REPOSITORY="kickable"
-          earthly --use-inline-cache --push +poem --VERSION="$VERSION" --REPOSITORY="kickable"
-          earthly --use-inline-cache --push +rocket --VERSION="$VERSION" --REPOSITORY="kickable"
-          earthly --use-inline-cache --push +rouille --VERSION="$VERSION" --REPOSITORY="kickable"
-          earthly --use-inline-cache --push +salvo --VERSION="$VERSION" --REPOSITORY="kickable"
-          earthly --use-inline-cache --push +tonic-client --VERSION="$VERSION" --REPOSITORY="kickable"
-          earthly --use-inline-cache --push +tonic-server --VERSION="$VERSION" --REPOSITORY="kickable"
-          earthly --use-inline-cache --push +trillium --VERSION="$VERSION" --REPOSITORY="kickable"
-          earthly --use-inline-cache --push +viz --VERSION="$VERSION" --REPOSITORY="kickable"
-          earthly --use-inline-cache --push +warp --VERSION="$VERSION" --REPOSITORY="kickable"
+          earthly --use-inline-cache --push +services --VERSION="$VERSION" --REPOSITORY="kickable"
diff --git a/.github/workflows/release_ghcr.yml b/.github/workflows/release_ghcr.yml
@@ -48,15 +48,4 @@ jobs:
 
       - name: build docker services
         run: |
-          earthly --use-inline-cache --push +axum --VERSION="$VERSION" --REPOSITORY="ghcr.io/${{ github.repository }}"
-          earthly --use-inline-cache --push +gotham --VERSION="$VERSION" --REPOSITORY="ghcr.io/${{ github.repository }}"
-          earthly --use-inline-cache --push +graphul --VERSION="$VERSION" --REPOSITORY="ghcr.io/${{ github.repository }}"
-          earthly --use-inline-cache --push +poem --VERSION="$VERSION" --REPOSITORY="ghcr.io/${{ github.repository }}"
-          earthly --use-inline-cache --push +rocket --VERSION="$VERSION" --REPOSITORY="ghcr.io/${{ github.repository }}"
-          earthly --use-inline-cache --push +rouille --VERSION="$VERSION" --REPOSITORY="ghcr.io/${{ github.repository }}"
-          earthly --use-inline-cache --push +salvo --VERSION="$VERSION" --REPOSITORY="ghcr.io/${{ github.repository }}"
-          earthly --use-inline-cache --push +tonic-client --VERSION="$VERSION" --REPOSITORY="ghcr.io/${{ github.repository }}"
-          earthly --use-inline-cache --push +tonic-server --VERSION="$VERSION" --REPOSITORY="ghcr.io/${{ github.repository }}"
-          earthly --use-inline-cache --push +trillium --VERSION="$VERSION" --REPOSITORY="ghcr.io/${{ github.repository }}"
-          earthly --use-inline-cache --push +viz --VERSION="$VERSION" --REPOSITORY="ghcr.io/${{ github.repository }}"
-          earthly --use-inline-cache --push +warp --VERSION="$VERSION" --REPOSITORY="ghcr.io/${{ github.repository }}"
+          earthly --use-inline-cache --push +services --VERSION="$VERSION" --REPOSITORY="ghcr.io/${{ github.repository }}"
diff --git a/Earthfile b/Earthfile
@@ -55,108 +55,124 @@ kickable-build:
     ARG REPOSITORY=${ORG}
     COPY --platform=linux/amd64 (+build/${BIN_NAME}) /usr/local/bin/kickable
     ENTRYPOINT ["/usr/local/bin/kickable"]
-    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}:${VERSION}
+    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}:${VERSION} ${REPOSITORY}/${BIN_NAME}:latest
 
 service:
     ARG port=31337
     FROM scratch
     EXPOSE $port
 
+services:
+    ARG VERSION=latest
+    ARG REPOSITORY=${ORG}
+    BUILD --platform=linux/amd64 --platform=linux/arm64 +axum --VERSION=${VERSION} --REPOSITORY=${REPOSITORY}
+    BUILD --platform=linux/amd64 --platform=linux/arm64 +gotham --VERSION=${VERSION} --REPOSITORY=${REPOSITORY}
+    BUILD --platform=linux/amd64 --platform=linux/arm64 +graphul --VERSION=${VERSION} --REPOSITORY=${REPOSITORY}
+    BUILD --platform=linux/amd64 --platform=linux/arm64 +poem --VERSION=${VERSION} --REPOSITORY=${REPOSITORY}
+    BUILD --platform=linux/amd64 --platform=linux/arm64 +rocket --VERSION=${VERSION} --REPOSITORY=${REPOSITORY}
+    BUILD --platform=linux/amd64 --platform=linux/arm64 +rouille --VERSION=${VERSION} --REPOSITORY=${REPOSITORY}
+    BUILD --platform=linux/amd64 --platform=linux/arm64 +salvo --VERSION=${VERSION} --REPOSITORY=${REPOSITORY}
+    BUILD --platform=linux/amd64 --platform=linux/arm64 +tonic-client --VERSION=${VERSION} --REPOSITORY=${REPOSITORY}
+    BUILD --platform=linux/amd64 --platform=linux/arm64 +tonic-server --VERSION=${VERSION} --REPOSITORY=${REPOSITORY}
+    BUILD --platform=linux/amd64 --platform=linux/arm64 +trillium --VERSION=${VERSION} --REPOSITORY=${REPOSITORY}
+    BUILD --platform=linux/amd64 --platform=linux/arm64 +viz --VERSION=${VERSION} --REPOSITORY=${REPOSITORY}
+    BUILD --platform=linux/amd64 --platform=linux/arm64 +warp --VERSION=${VERSION} --REPOSITORY=${REPOSITORY}
+
 axum:
     FROM +service
     ARG VERSION=latest
     ARG REPOSITORY=${ORG}
     COPY --platform=linux/amd64 (+build/axum) /usr/local/bin/axum
     ENTRYPOINT ["/usr/local/bin/axum"]
-    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-axum:${VERSION}
+    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-axum:${VERSION} ${REPOSITORY}/${BIN_NAME}-axum:latest
 
 gotham:
     FROM +service
     ARG VERSION=latest
     ARG REPOSITORY=${ORG}
-    COPY +build/gotham /usr/local/bin/gotham
+    COPY --platform=linux/amd64 (+build/gotham) /usr/local/bin/gotham
     ENTRYPOINT ["/usr/local/bin/gotham"]
-    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-gotham:${VERSION}
+    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-gotham:${VERSION} ${REPOSITORY}/${BIN_NAME}-gotham:latest
 
 graphul:
     FROM +service
     ARG VERSION=latest
     ARG REPOSITORY=${ORG}
-    COPY +build/graphul /usr/local/bin/graphul
+    COPY --platform=linux/amd64 (+build/graphul) /usr/local/bin/graphul
     ENTRYPOINT ["/usr/local/bin/graphul"]
-    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-graphul:${VERSION}
+    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-graphul:${VERSION} ${REPOSITORY}/${BIN_NAME}-graphul:latest
 
 poem:
     FROM +service
     ARG VERSION=latest
     ARG REPOSITORY=${ORG}
-    COPY +build/poem /usr/local/bin/poem
+    COPY --platform=linux/amd64 (+build/poem) /usr/local/bin/poem
     ENTRYPOINT ["/usr/local/bin/poem"]
-    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-poem:${VERSION}
+    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-poem:${VERSION} ${REPOSITORY}/${BIN_NAME}-poem:latest
 
 rocket:
     FROM +service
     ARG VERSION=latest
     ARG REPOSITORY=${ORG}
-    COPY +build/rocket /usr/local/bin/rocket
+    COPY --platform=linux/amd64 (+build/rocket) /usr/local/bin/rocket
     ENTRYPOINT ["/usr/local/bin/rocket"]
-    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-rocket:${VERSION}
+    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-rocket:${VERSION} ${REPOSITORY}/${BIN_NAME}-rocket:latest
 
 rouille:
     FROM +service
     ARG VERSION=latest
     ARG REPOSITORY=${ORG}
-    COPY +build/rouille /usr/local/bin/rouille
+    COPY --platform=linux/amd64 (+build/rouille) /usr/local/bin/rouille
     ENTRYPOINT ["/usr/local/bin/rouille"]
-    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-rouille:${VERSION}
+    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-rouille:${VERSION} ${REPOSITORY}/${BIN_NAME}-rouille:latest
 
 salvo:
     FROM +service
     ARG VERSION=latest
     ARG REPOSITORY=${ORG}
-    COPY +build/salvo /usr/local/bin/salvo
+    COPY --platform=linux/amd64 (+build/salvo) /usr/local/bin/salvo
     ENTRYPOINT ["/usr/local/bin/salvo"]
-    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-salvo:${VERSION}
+    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-salvo:${VERSION} ${REPOSITORY}/${BIN_NAME}-salvo:latest
 
 tonic-client:
     FROM +service
     ARG VERSION=latest
     ARG REPOSITORY=${ORG}
-    COPY +build/tonic-client /usr/local/bin/tonic-client
+    COPY --platform=linux/amd64 (+build/tonic-client) /usr/local/bin/tonic-client
     ENTRYPOINT ["/usr/local/bin/tonic-client"]
-    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-tonic-client:${VERSION}
+    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-tonic-client:${VERSION} ${REPOSITORY}/${BIN_NAME}-tonic-client:latest
 
 tonic-server:
     FROM +service
     ARG VERSION=latest
     ARG REPOSITORY = ${ORG}
-    COPY +build/tonic-server /usr/local/bin/tonic-server
+    COPY --platform=linux/amd64 (+build/tonic-server) /usr/local/bin/tonic-server
     ENTRYPOINT ["/usr/local/bin/tonic-server"]
-    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-tonic-server:${VERSION}
+    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-tonic-server:${VERSION} ${REPOSITORY}/${BIN_NAME}-tonic-server:latest
 
 trillium:
     FROM +service
     ARG VERSION=latest
     ARG REPOSITORY=${ORG}
-    COPY +build/trillium /usr/local/bin/trillium
+    COPY --platform=linux/amd64 (+build/trillium) /usr/local/bin/trillium
     ENTRYPOINT ["/usr/local/bin/trillium"]
-    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-trillium:${VERSION}
+    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-trillium:${VERSION} ${REPOSITORY}/${BIN_NAME}-trillium:latest
 
 viz:
     FROM +service
     ARG VERSION=latest
     ARG REPOSITORY=${ORG}
-    COPY +build/viz /usr/local/bin/viz
+    COPY --platform=linux/amd64 (+build/viz) /usr/local/bin/viz
     ENTRYPOINT ["/usr/local/bin/viz"]
-    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-viz:${VERSION}
+    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-viz:${VERSION} ${REPOSITORY}/${BIN_NAME}-viz:latest
 
 warp:
     FROM +service
     ARG VERSION=latest
     ARG REPOSITORY=${ORG}
-    COPY +build/warp /usr/local/bin/warp
+    COPY --platform=linux/amd64 (+build/warp) /usr/local/bin/warp
     ENTRYPOINT ["/usr/local/bin/warp"]
-    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-warp:${VERSION}
+    SAVE IMAGE --push ${REPOSITORY}/${BIN_NAME}-warp:${VERSION} ${REPOSITORY}/${BIN_NAME}-warp:latest
 
 
 aarch64-apple-darwin: