diff --git a/.gitignore b/.gitignore index 66cf84f..d71e586 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related diff --git a/cmd/build.md b/cmd/build.md index 29abf18..63911dd 100644 --- a/cmd/build.md +++ b/cmd/build.md @@ -8,7 +8,8 @@ flutter clean #flutter build web --web-renderer canvaskit echo 'build web html' -flutter build web --web-renderer html +flutter build web +#flutter build web --web-renderer html ``` diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..cb0e066 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,10 @@ +#FROM nginx:latest +#COPY ./kk_etcd_ui/build/web /usr/share/nginx/html/web +#COPY ./kk_etcd_ui/lib/docker/default.conf /etc/nginx/conf.d/default.conf +#EXPOSE 80 + +FROM jitesoft/lighttpd:latest + +COPY ../build/web /var/www/html +EXPOSE 80 + diff --git a/docker/Dockerfile-ui b/docker/Dockerfile-ui deleted file mode 100644 index 2270e91..0000000 --- a/docker/Dockerfile-ui +++ /dev/null @@ -1,23 +0,0 @@ -#FROM nginx:latest -#COPY ./kk_etcd_ui/build/web /usr/share/nginx/html/web -#COPY ./kk_etcd_ui/lib/docker/default.conf /etc/nginx/conf.d/default.conf -#EXPOSE 80 - -FROM jitesoft/lighttpd:latest -COPY ./kk_etcd_ui/build/web /var/www/html -EXPOSE 80 - -# 本地构建测试 -# docker build -t kk_etcd_ui_local -f Dockerfile-ui . -# docker run --name kk_etcd_ui_local -p 2334:80 kk_etcd_ui_local - - -# 多平台构建-发布 -# docker login -# docker buildx build --platform linux/amd64,linux/arm64 -t cruvie/kk_etcd_ui:1.4.0 -f Dockerfile-ui . --push - - -# 测试 -# docker pull cruvie/kk_etcd_ui:1.4.0 -# docker run --name kk_etcd_ui -p 2334:80 cruvie/kk_etcd_ui:1.4.0 - diff --git a/docker/build.sh b/docker/build.sh new file mode 100644 index 0000000..ee76c50 --- /dev/null +++ b/docker/build.sh @@ -0,0 +1,20 @@ + + +cd .. + +#docker build -t kk_etcd_ui_local -f docker/Dockerfile . + +# 本地构建测试 +# docker build -t kk_etcd_ui_local -f docker/Dockerfile . +# docker run --name kk_etcd_ui_local -p 2334:80 kk_etcd_ui_local + + +# 多平台构建-发布 +# docker login 可以先登陆docker desktop + docker buildx build --platform linux/amd64,linux/arm64 -t cruvie/kk_etcd_ui:1.4.1 -f docker/Dockerfile . --push + + +# 测试 +# docker pull cruvie/kk_etcd_ui:1.4.1 +# docker run --name kk_etcd_ui -p 2334:80 cruvie/kk_etcd_ui:1.4.1 + diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift index 8e02df2..b3c1761 100644 --- a/macos/Runner/AppDelegate.swift +++ b/macos/Runner/AppDelegate.swift @@ -6,4 +6,8 @@ class AppDelegate: FlutterAppDelegate { override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { return true } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } } diff --git a/pubspec.yaml b/pubspec.yaml index f667ee7..d98d3b7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,10 +4,10 @@ description: Etcd UI # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 1.4.0 +version: 1.4.1 environment: - sdk: '>=3.5.4' + sdk: '>=3.6.0' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions