Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.docker-cache/
build_output.log
20 changes: 10 additions & 10 deletions build/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -97,26 +97,26 @@ target "core-base" {
dockerfile = "./core/.docker/core.bake.Dockerfile"
target = "core-base"
tags = ["${REGISTRY}/core-base:${TAG}"]
cache-from = ["type=local,src=/tmp/${REGISTRY}/core-base"]
cache-to = ["type=local,dest=/tmp/${REGISTRY}/core-base,mode=max"]
cache-from = ["type=local,src=./.docker-cache/${REGISTRY}/core-base"]
cache-to = ["type=local,dest=./.docker-cache/${REGISTRY}/core-base,mode=max"]
}

target "core-wasm" {
inherits = ["_common"]
context = ".."
dockerfile = "./core/.docker/core-wasm.bake.Dockerfile"
tags = ["${REGISTRY}/core-wasm:${TAG}"]
cache-from = ["type=local,src=/tmp/${REGISTRY}/core-wasm"]
cache-to = ["type=local,dest=/tmp/${REGISTRY}/core-wasm,mode=max"]
cache-from = ["type=local,src=./.docker-cache/${REGISTRY}/core-wasm"]
cache-to = ["type=local,dest=./.docker-cache/${REGISTRY}/core-wasm,mode=max"]
}

target "desktop-js" {
inherits = ["_common"]
context = ".."
dockerfile = "./desktop-apps/.docker/desktop-js.bake.Dockerfile"
tags = ["${REGISTRY}/desktop-js:${TAG}"]
cache-from = ["type=local,src=/tmp/${REGISTRY}/desktop-js"]
cache-to = ["type=local,dest=/tmp/${REGISTRY}/desktop-js,mode=max"]
cache-from = ["type=local,src=./.docker-cache/${REGISTRY}/desktop-js"]
cache-to = ["type=local,dest=./.docker-cache/${REGISTRY}/desktop-js,mode=max"]
}

target "sdkjs-desktop" {
Expand All @@ -125,8 +125,8 @@ target "sdkjs-desktop" {
dockerfile = "./sdkjs/.docker/sdkjs.bake.Dockerfile"
tags = ["${REGISTRY}/sdkjs-desktop:${TAG}"]
target = "sdkjs-desktop"
cache-from = ["type=local,src=/tmp/${REGISTRY}/sdkjs-desktop"]
cache-to = ["type=local,dest=/tmp/${REGISTRY}/sdkjs-desktop,mode=max"]
cache-from = ["type=local,src=./.docker-cache/${REGISTRY}/sdkjs-desktop"]
cache-to = ["type=local,dest=./.docker-cache/${REGISTRY}/sdkjs-desktop,mode=max"]
contexts = {
core-wasm = "target:core-wasm"
}
Expand All @@ -137,8 +137,8 @@ target "web-apps" {
context = ".."
dockerfile = "./web-apps/.docker/web-apps.bake.Dockerfile"
tags = ["${REGISTRY}/web-apps:${TAG}"]
cache-from = ["type=local,src=/tmp/${REGISTRY}/web-apps"]
cache-to = ["type=local,dest=/tmp/${REGISTRY}/web-apps,mode=max"]
cache-from = ["type=local,src=./.docker-cache/${REGISTRY}/web-apps"]
cache-to = ["type=local,dest=./.docker-cache/${REGISTRY}/web-apps,mode=max"]
}

# ──────────────────────────────────────────────
Expand Down
15 changes: 0 additions & 15 deletions build/linux/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -88,20 +88,6 @@ target "_common" {
# DEPENDENCY TARGETS
# ──────────────────────────────────────────────

target "third-party" {
inherits = ["_common"]
context = "../.."
dockerfile = "./core/.docker/third-party.bake.Dockerfile"
target = "third-party-builder"
secret = [
"id=nextcloud_user,env=NEXTCLOUD_USER",
"id=nextcloud_pass,env=NEXTCLOUD_PASS",
]
tags = ["${REGISTRY}/third-party:${TAG}"]
cache-from = ["type=local,src=/tmp/${REGISTRY}/third-party"]
cache-to = ["type=local,dest=/tmp/${REGISTRY}/third-party,mode=max"]
}


target "core-base" {
inherits = ["_common"]
Expand All @@ -126,7 +112,6 @@ target "desktop-linux" {
contexts = {
desktop-common = "docker-image://${REGISTRY}/desktop-common:${GIT_COMMIT}"
core-base = "target:core-base"
third-party = "target:third-party"
}
secret = [
"id=nextcloud_user,env=NEXTCLOUD_USER",
Expand Down
2 changes: 1 addition & 1 deletion desktop-apps
Submodule desktop-apps updated 66 files
+5 −3 .docker/desktop-apps.bake.Dockerfile
+26 −26 win-linux/CMakeLists.txt
+5 −5 win-linux/defaults.pri
+1 −1 win-linux/res/styles/styles.qss
+1 −1 win-linux/res/styles/styles@1.25x.qss
+1 −1 win-linux/res/styles/styles@1.5x.qss
+1 −1 win-linux/res/styles/styles@1.75x.qss
+1 −1 win-linux/res/styles/styles@2.25x.qss
+1 −1 win-linux/res/styles/styles@2.5x.qss
+1 −1 win-linux/res/styles/styles@2.75x.qss
+1 −1 win-linux/res/styles/styles@2x.qss
+1 −1 win-linux/res/styles/styles@3.5x.qss
+1 −1 win-linux/res/styles/styles@3x.qss
+1 −1 win-linux/res/styles/styles@4.5x.qss
+1 −1 win-linux/res/styles/styles@4x.qss
+1 −1 win-linux/res/styles/styles@5x.qss
+2 −2 win-linux/src/cappeventfilter.h
+1 −1 win-linux/src/cascapplicationmanagerwrapper.cpp
+4 −4 win-linux/src/cascapplicationmanagerwrapper.h
+2 −2 win-linux/src/cascapplicationmanagerwrapper_private.h
+1 −1 win-linux/src/ccefeventsgate.h
+0 −2 win-linux/src/ccefeventstransformer.h
+2 −2 win-linux/src/ceventdriver.h
+3 −3 win-linux/src/cfilechecker.h
+1 −1 win-linux/src/clangater.h
+1 −1 win-linux/src/clogger.cpp
+2 −2 win-linux/src/clogger.h
+2 −2 win-linux/src/components/asctabwidget.h
+1 −1 win-linux/src/components/canimatedicon.h
+6 −0 win-linux/src/components/cdownloadwidget.cpp
+1 −1 win-linux/src/components/celipsislabel.h
+1 −1 win-linux/src/components/cfullscrwidget.h
+7 −1 win-linux/src/components/cmenu.cpp
+1 −1 win-linux/src/components/cmenu.h
+1 −1 win-linux/src/components/ctabbar.cpp
+1 −1 win-linux/src/components/ctabbar.h
+2 −2 win-linux/src/components/ctabpanel.h
+6 −0 win-linux/src/components/ctooltip.cpp
+1 −1 win-linux/src/cprintdata.cpp
+2 −2 win-linux/src/ctabstyle.cpp
+1 −1 win-linux/src/ctabstyle.h
+1 −1 win-linux/src/cupdatemanager.cpp
+2 −2 win-linux/src/cupdatemanager.h
+3 −1 win-linux/src/main.cpp
+1 −1 win-linux/src/platform_linux/cdialogopenssl.h
+22 −2 win-linux/src/platform_linux/gtkprintdialog.cpp
+3 −3 win-linux/src/platform_linux/gtkutils.cpp
+72 −7 win-linux/src/platform_linux/linux_window_utils.cpp
+4 −4 win-linux/src/platform_linux/linux_window_utils.h
+2 −2 win-linux/src/platform_linux/singleapplication.h
+4 −4 win-linux/src/platform_linux/xdgdesktopportal.cpp
+1 −1 win-linux/src/platform_win/association.cpp
+2 −2 win-linux/src/platform_win/singleapplication.h
+1 −1 win-linux/src/prop/cmainwindowimpl.h
+13 −8 win-linux/src/utils.cpp
+7 −7 win-linux/src/windows/ceditorwindow.cpp
+1 −1 win-linux/src/windows/ceditorwindow.h
+2 −2 win-linux/src/windows/cmainwindow.cpp
+3 −3 win-linux/src/windows/cmainwindow.h
+2 −2 win-linux/src/windows/cpresenterwindow.cpp
+67 −60 win-linux/src/windows/platform_linux/cplatformdecoration.cpp
+6 −6 win-linux/src/windows/platform_linux/cplatformdecoration.h
+26 −12 win-linux/src/windows/platform_linux/cwindowplatform.cpp
+6 −2 win-linux/src/windows/platform_linux/cwindowplatform.h
+0 −53 win-linux/src/windows/platform_linux/cx11caption.cpp
+1 −1 win-linux/src/windows/platform_win/caption.h