Revert to building outside, try oraclelinux:8-slim, disable docker …

…buildx, try to fix envvar in cloud run deploy.
ReactiveCircus · Aug 14, 2024 · 9026f45 · 9026f45
1 parent c4b84ac
commit 9026f45
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -51,18 +51,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-#      - uses: graalvm/setup-graalvm@v1
-#        with:
-#          distribution: 'graalvm-community'
-#          java-version: '22'
-#          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          distribution: 'graalvm-community'
+          java-version: '22'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: gradle/actions/setup-gradle@v4
 
-#      - name: Build GraalVM native executable
-#        run: ./gradlew nativeCompile --no-configuration-cache
+      - name: Build GraalVM native executable
+        run: ./gradlew nativeCompile --no-configuration-cache
 
-      - uses: docker/setup-buildx-action@v3
+#      - uses: docker/setup-buildx-action@v3
 
       - uses: docker/login-action@v3
         with:
@@ -85,13 +85,13 @@ jobs:
 
       - name: Deploy to Cloud Run
         run: |
-          gcloud run deploy $SERVICE_NAME \
-            --image $CONTAINER_IMAGE:latest \
-            --region $REGION \
-            --cpu $CPU \
-            --memory $MEMORY \
-            --timeout $REQUEST_TIMEOUT \
-            --min-instances $MIN_INSTANCES \
-            --max-instances $MAX_INSTANCES \
+          gcloud run deploy ${{ env.SERVICE_NAME }} \
+            --image ${{ env.CONTAINER_IMAGE }}:latest \
+            --region ${{ env.REGION }} \
+            --cpu ${{ env.CPU }} \
+            --memory ${{ env.MEMORY }} \
+            --timeout ${{ env.REQUEST_TIMEOUT }} \
+            --min-instances ${{ env.MIN_INSTANCES }} \
+            --max-instances ${{ env.MAX_INSTANCES }} \
             --platform managed \
             --allow-unauthenticated
diff --git a/Dockerfile b/Dockerfile
@@ -1,15 +1,5 @@
-# Build stage
-FROM ghcr.io/graalvm/graalvm-community:22 as build
+FROM docker.io/oraclelinux:8-slim
 
-WORKDIR /app
-
-COPY . .
-
-RUN ./gradlew nativeCompile --no-configuration-cache
-
-# Runtime stage
-FROM scratch
-
-COPY --from=build /app/build/native/nativeCompile/kstreamlined-backend /app/kstreamlined-backend
+COPY build/native/nativeCompile/kstreamlined-backend /app/kstreamlined-backend
 
 ENTRYPOINT ["/app/kstreamlined-backend"]