Skip to content

Commit bdf125e

Browse files
donknapdonknap
committed
v1.9.2
1 parent c716261 commit bdf125e

File tree

10 files changed

+12
-8
lines changed

10 files changed

+12
-8
lines changed

‎app/application/http/controller/image.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,8 @@ func (self Image) GetList(http *gin.Context) {
235235

236236
var result []image.Summary
237237
imageList, err := docker.Sdk.Client.ImageList(docker.Sdk.Ctx, image.ListOptions{
238-
All: false,
238+
All: false,
239+
Manifests: true,
239240
})
240241
if err != nil {
241242
self.JsonResponseWithError(http, err, 500)

‎app/application/logic/docker-image-task.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ func (self DockerTask) ImageRemote(w *ws.ProgressPip, r io.ReadCloser) error {
138138
}
139139
if pd.Status == "Pull complete" {
140140
pg[pd.Id].Extracting = 100
141+
pg[pd.Id].Downloading = 100
141142
}
142143
if pd.Status == "Pushed" || pd.Status == "Layer already exists" {
143144
pg[pd.Id].Downloading = 100

‎app/common/http/controller/store.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,8 @@ func (self Store) Deploy(http *gin.Context) {
280280
if v, ok := onepanel.DefaultEnv[params.AppName]; ok {
281281
params.VersionInfo.Environment = append(params.VersionInfo.Environment, v...)
282282
}
283+
// docker 29 容器名称变量变为严格判断不能为空
284+
params.VersionInfo.Environment = append(params.VersionInfo.Environment, onepanel.CommonEnv[define.StoreEnvContainerName])
283285
}
284286

285287
// 适配 bt

‎asset/static/1218.7e251b3f.async.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎asset/static/1218.cd7f428c.async.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎asset/static/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
</head>
1919
<body>
2020
<div id="root"></div>
21-
<script src="/dpanel/static/asset/umi.165fc90e.js"></script>
21+
<script src="/dpanel/static/asset/umi.30e31d51.js"></script>
2222
</body>
2323
</html>

asset/static/p__compose__appstore.9f4bf1bd.async.js renamed to asset/static/p__compose__appstore.a937ffe1.async.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎asset/static/p__image__list.a1ff015f.async.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎asset/static/p__image__list.c65d42fc.async.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

asset/static/umi.165fc90e.js renamed to asset/static/umi.30e31d51.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)