From 72291094c0bcd78e508725a0f3746437f25055f9 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Sat, 2 Oct 2021 23:14:04 -0700
Subject: [PATCH] Push framework image and fix rancherd

---
 Dockerfile      | 1 +
 Makefile        | 2 +-
 scripts/package | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bcd30e68..9f7067b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,6 +27,7 @@ RUN ["luet", \
     "toolchain/yip", \
     "utils/installer", \
     "utils/k9s", \
+    "utils/rancherd", \
     "utils/nerdctl"]
 
 COPY --from=build /usr/sbin/ros-installer /usr/sbin/ros-installer
diff --git a/Makefile b/Makefile
index c09adbe0..7553f3c0 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ push:
 	docker push ${IMAGE}
 
 .PHONY: push
-push-framework:
+push-framework: build-framework
 	docker push ${REPO}-framework:${TAG}
 
 .PHONY: iso
diff --git a/scripts/package b/scripts/package
index 9645b4d5..0c0fc1c5 100755
--- a/scripts/package
+++ b/scripts/package
@@ -16,6 +16,7 @@ fi
 
 if [ "$PUSH" = "true" ]; then
     make push
+    make push-framework
 fi