Merge pull request #133 from Zondax/update_docker_image

Update docker image
Zondax · May 20, 2024 · 5f6f07a · 5f6f07a
2 parents a669ab0 + b7088ee
commit 5f6f07a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/app/ui/view.h b/app/ui/view.h
@@ -29,6 +29,17 @@
 #endif
 #endif
 
+// By default our builds are not production ready
+// Unless we specificaly define PRODUCTION_BUILD to 1
+#if (PRODUCTION_BUILD == 0)
+#undef MENU_MAIN_APP_LINE1
+#undef MENU_MAIN_APP_LINE2
+
+#define MENU_MAIN_APP_LINE1 APPVERSION_LINE1 " DEMO"
+#define MENU_MAIN_APP_LINE2 "DO NOT USE"
+#endif
+
+
 typedef struct {
     uint8_t displayIdx;
     char *outKey;

diff --git a/dockerized_build.mk b/dockerized_build.mk
@@ -47,7 +47,7 @@ $(info TESTS_ZEMU_DIR        : $(TESTS_ZEMU_DIR))
 $(info TESTS_JS_DIR          : $(TESTS_JS_DIR))
 $(info TESTS_JS_PACKAGE      : $(TESTS_JS_PACKAGE))
 
-DOCKER_IMAGE_ZONDAX=zondax/ledger-app-builder:ledger-fc5c0e3614a2a6216b827f4325f965dd303e619b
+DOCKER_IMAGE_ZONDAX=zondax/ledger-app-builder:ledger-b72eadb7412689490aad1433cb0e913533d00e34
 DOCKER_IMAGE_LEDGER=ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
 
 ifdef INTERACTIVE
@@ -79,6 +79,7 @@ define run_docker
 	-e DISABLE_CURRENT=$(DISABLE_CURRENT) \
 	-e COIN=$(COIN) \
 	-e APP_TESTING=$(APP_TESTING) \
+	-e PRODUCTION_BUILD=$(PRODUCTION_BUILD) \
 	$(DOCKER_IMAGE_ZONDAX) "$(3)"
 endef
 

diff --git a/include/zxversion.h b/include/zxversion.h
@@ -15,6 +15,6 @@
  ********************************************************************************/
 #pragma once
 
-#define ZXLIB_MAJOR 25
+#define ZXLIB_MAJOR 26
 #define ZXLIB_MINOR 0
-#define ZXLIB_PATCH 1
+#define ZXLIB_PATCH 0