Merge pull request #19 from danfengliu/save-image-pkg

save-image-pkg

.github/workflows/push.yml

@@ -46,10 +46,22 @@ jobs:
       with:
         version: latest
 
+    # Only try to publish the container image from the root repo; forks don't have permission to do so and will always get failures.
+    - name: Publish container image
+      if: github.repository == 'vmware-tanzu/velero'
+      run: |
+        docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
+        ./hack/docker-push.sh
 
     # Push image to GCR to facilitate some environments that have rate limitation to docker hub, e.g. vSphere.
     - name: Publish container image to GCP
       run: |
         source hack/ci/build_util.sh
-        echo 1 > 1.txt
-        uploader  1.txt velero-builds
+        VELERO_IMAGE=velero-main
+        VELERO_RESTORE_HELPER_IMAGE=velero-restore-helper-main
+        cp $VELERO_IMAGE $VELERO_IMAGE-'build.'$GITHUB_RUN_NUMBER
+        cp $VELERO_RESTORE_HELPER_IMAGE $VELERO_RESTORE_HELPER_IMAGE-'build.'$GITHUB_RUN_NUMBER
+        uploader  ${VELERO_IMAGE}.tar.gz velero-builds
+        uploader  ${VELERO_RESTORE_HELPER_IMAGE}.tar.gz velero-builds
+        uploader  ${VELERO_IMAGE}-'build.'$GITHUB_RUN_NUMBER.tar.gz velero-builds
+        uploader  ${VELERO_RESTORE_HELPER_IMAGE}-'build.'$GITHUB_RUN_NUMBER.tar.gz velero-builds

Makefile

@@ -209,6 +209,8 @@ endif
 	--build-arg=RESTIC_VERSION=$(RESTIC_VERSION) \
 	-f $(VELERO_DOCKERFILE) .
 	@echo "container: $(IMAGE):$(VERSION)"
+	@docker save $(IMAGE):$(VERSION) > $(BIN)-$(VERSION).tar && @gzip $(BIN)-$(VERSION).tar
+
 
 SKIP_TESTS ?=
 test: build-dirs