Merge pull request #40 from spidernet-io/pr/welan/crd

ew
spidernet-io · Oct 20, 2022 · 5111553 · 5111553
2 parents 4523d56 + 095766a
commit 5111553
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/build-image-base.yaml b/.github/workflows/build-image-base.yaml
@@ -77,7 +77,7 @@ jobs:
             echo "use re $ref , by workflow_dispatch"
             echo "RUN_event_ref=${ref}" >> $GITHUB_ENV
             echo "RUN_PUSH=true" >> $GITHUB_ENV
-          if ${{ github.event_name == 'pull_request_target' }} ; then
+          elif ${{ github.event_name == 'pull_request_target' }} ; then
             #trigger by pr
             echo "use sha ${{ github.event.pull_request.head.sha }} , by pr"
             echo "RUN_event_ref=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV

diff --git a/.github/workflows/build-image-ci.yaml b/.github/workflows/build-image-ci.yaml
@@ -20,10 +20,20 @@ on:
 permissions: write-all
 
 jobs:
-  call-by:
+  call-by-workflow:
     uses: ./.github/workflows/call-release-image.yaml
+    if: ${{ inputs.ref != '' }}
     with:
       ref: ${{ inputs.ref }}
       push: "false"
       race: "1"
     secrets: inherit
+
+  call-by-pr:
+    uses: ./.github/workflows/call-release-image.yaml
+    if: ${{ github.event_name == 'pull_request_target' }}
+    with:
+      ref: ${{ github.event.pull_request.head.sha }}
+      push: "false"
+      race: "1"
+    secrets: inherit
diff --git a/images/agent/Dockerfile b/images/agent/Dockerfile
@@ -52,4 +52,5 @@ ENV ENV_VERSION=${VERSION}
 
 COPY --from=builder /tmp/install/${TARGETOS}/${TARGETARCH}/bin/*   /usr/bin/
 
+#====modify====
 CMD ["/usr/bin/agent"]
diff --git a/images/controller-base/build-gops.sh b/images/controller-base/build-gops.sh
@@ -28,6 +28,5 @@ for arch in amd64 arm64 ; do
   GOARCH="${arch}" CGO_ENABLED=0 go build -ldflags "-s -w" -o "/out/linux/${arch}/bin/gops" github.com/google/gops
 done
 
-
 x86_64-linux-gnu-strip /out/linux/amd64/bin/gops
 aarch64-linux-gnu-strip /out/linux/arm64/bin/gops
diff --git a/images/controller/Dockerfile b/images/controller/Dockerfile
@@ -52,4 +52,6 @@ ENV ENV_VERSION=${VERSION}
 
 COPY --from=builder /tmp/install/${TARGETOS}/${TARGETARCH}/bin/*   /usr/bin/
 
+#====modify====
 CMD ["/usr/bin/controller"]
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,4 +52,5 @@ ENV ENV_VERSION=${VERSION}

		COPY --from=builder /tmp/install/${TARGETOS}/${TARGETARCH}/bin/* /usr/bin/

		#====modify====
		CMD ["/usr/bin/agent"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,4 +52,6 @@ ENV ENV_VERSION=${VERSION}

		COPY --from=builder /tmp/install/${TARGETOS}/${TARGETARCH}/bin/* /usr/bin/

		#====modify====
		CMD ["/usr/bin/controller"]