Skip to content
Open
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
10 changes: 10 additions & 0 deletions build/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ variable "PRODUCT_NAME" {
default = "Desktop Editors"
}

variable "ARCH_TRIPLET" {
default = "x64-linux-v2"
}

variable "ARCH_MARCH_FLAGS" {
default = "-march=x86-64-v2"
}

# ──────────────────────────────────────────────
# BUILD GROUPS
# ──────────────────────────────────────────────
Expand Down Expand Up @@ -84,6 +92,8 @@ target "_common" {
PRODUCT_NAME = "${PRODUCT_NAME}"
COMPANY_NAME = "${COMPANY_NAME}"
COMPANY_NAME_LOW = "${COMPANY_NAME_LOW}"
ARCH_TRIPLET = "${ARCH_TRIPLET}"
ARCH_MARCH_FLAGS = "${ARCH_MARCH_FLAGS}"
}
}

Expand Down
8 changes: 7 additions & 1 deletion build/linux/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,14 @@ COMPANY_NAME="Euro-Office"
PRODUCT_NAME="Desktop Editors"
GIT_COMMIT=$(git rev-parse --short HEAD)

# Override to produce a baseline x86-64 build for legacy hardware, e.g.:
# ARCH_TRIPLET=x64-linux-baseline ARCH_MARCH_FLAGS=-march=x86-64 ./build.sh
ARCH_TRIPLET="${ARCH_TRIPLET:-x64-linux-v2}"
ARCH_MARCH_FLAGS="${ARCH_MARCH_FLAGS:--march=x86-64-v2}"

export NEXTCLOUD_USER NEXTCLOUD_PASS REGISTRY TAG PRODUCT_VERSION \
BUILD_NUMBER BRANDING_DIR COMPANY_NAME PRODUCT_NAME GIT_COMMIT
BUILD_NUMBER BRANDING_DIR COMPANY_NAME PRODUCT_NAME GIT_COMMIT \
ARCH_TRIPLET ARCH_MARCH_FLAGS

docker buildx bake -f ../docker-bake.hcl -f docker-bake.hcl packages \
--set "desktop-linux.contexts.desktop-common=target:desktop-common" \
Expand Down
10 changes: 10 additions & 0 deletions build/linux/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ variable "PRODUCT_NAME" {
default = "Desktop Editors"
}

variable "ARCH_TRIPLET" {
default = "x64-linux-v2"
}

variable "ARCH_MARCH_FLAGS" {
default = "-march=x86-64-v2"
}

# ──────────────────────────────────────────────
# BUILD GROUPS
# ──────────────────────────────────────────────
Expand All @@ -81,6 +89,8 @@ target "_common" {
PRODUCT_NAME = "${PRODUCT_NAME}"
COMPANY_NAME = "${COMPANY_NAME}"
COMPANY_NAME_LOW = "${COMPANY_NAME_LOW}"
ARCH_TRIPLET = "${ARCH_TRIPLET}"
ARCH_MARCH_FLAGS = "${ARCH_MARCH_FLAGS}"
}
}

Expand Down
2 changes: 1 addition & 1 deletion desktop-apps
Loading