New release v1.11.36-sc.3

Fix fedora container build
See: https://stackoverflow.com/a/74330717/4515820
2025-06-20 09:08:02 +02:00 · 2024-02-28 09:18:23 +01:00 · 2024-02-28 09:18:23 +01:00 · 2024-02-28 09:18:23 +01:00 · 2024-02-28 09:18:23 +01:00 · 2024-02-28 09:18:23 +01:00
7 changed files with 49 additions and 25 deletions
--- a/Containerfile.debian
+++ b/Containerfile.debian
@ -1,5 +1,5 @@
 ARG NODE_VERSION
-FROM node:${NODE_VERSION}
+FROM docker.io/node:${NODE_VERSION}-buster

 RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \
    curl \
@ -23,8 +23,4 @@ ENV RUSTUP_HOME=/usr/local/rustup \
    PATH=/usr/local/cargo/bin:$PATH
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal

-COPY . /project
-WORKDIR /project
-
-# There might be remnants of the host which break the build
-RUN make fixup
+WORKDIR /project
--- a/Containerfile.fedora
+++ b/Containerfile.fedora
@ -1,6 +1,6 @@
-FROM fedora:latest
+FROM docker.io/fedora:38

-RUN dnf install -y openssl openssl-devel rust cargo llvm libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
+RUN dnf install -y openssl openssl-devel cargo llvm libsecret libsecret-devel sqlcipher sqlcipher-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat pkgconf perl

 # node setup
 ARG NODE_VERSION
@ -13,8 +13,9 @@ RUN npm install -g yarn
 RUN npm install -g node-gyp
 RUN gem install --no-user-install --no-document fpm

-COPY . /project
-WORKDIR /project
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal

-# There might be remnants of the host which break the build
-RUN make fixup
+WORKDIR /project
--- a/Containerfile.windows
+++ b/Containerfile.windows
@ -0,0 +1,13 @@
+ARG CONTAINER_IMAGE_DEBIAN
+FROM ${CONTAINER_IMAGE_DEBIAN}:latest
+
+RUN dpkg --add-architecture i386 && apt-get update && apt-get install --no-install-recommends -y \
+    wine \
+    wine32 \
+    wine64 \
+    libwine \
+    libwine:i386 \
+    fonts-wine \
+    zip
+
+WORKDIR /project
--- a/34
+++ b/34
@ -1,8 +1,8 @@
 .PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
 .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
 .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
-.PHONY: container-build-debian container-build-fedora
-.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release
+.PHONY: container-build-debian container-build-fedora container-build-windows
+.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release container-windows-release container-release container-local-pkgbuild
 .PHONY: clean undo_setup fixup
 .PHONY: fix_yarn_cache

@ -12,7 +12,7 @@ all: web

 YARN ?= yarnpkg
 CONTAINER_ENGINE ?= podman
-NODE_VERSION ?= 16
+NODE_VERSION ?= 18

 VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
 WEB_APP_NAME :=  $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
@ -39,6 +39,7 @@ OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app

 CONTAINER_IMAGE_DEBIAN := schildichat-desktop-containerbuild-debian
 CONTAINER_IMAGE_FEDORA := schildichat-desktop-containerbuild-fedora
+CONTAINER_IMAGE_WINDOWS := schildichat-desktop-containerbuild-windows

 RELEASE_DIR := release
 CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
@ -76,7 +77,7 @@ web: setup

 desktop-common: web
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''
-	SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run build:native
+	SQLCIPHER_BUNDLED=1 $(YARN) --cwd element-desktop run build:native

 macos-common: web icns
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''
@ -162,22 +163,35 @@ macos-mas-release: macos-mas
 	cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR)

 container-build-debian:
-	$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) .
+	$(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) .

 container-build-fedora:
-	$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) .
+	$(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) .
+
+container-build-windows: container-build-debian
+	$(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_WINDOWS) -f Containerfile.windows --build-arg CONTAINER_IMAGE_DEBIAN=$(CONTAINER_IMAGE_DEBIAN) .

 container-web-release: container-build-debian
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release
+	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release

 container-debian-release: container-build-debian
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release
+	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release

 container-rpm-release: container-build-fedora
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release
+	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release

 container-appimage-release: container-build-debian
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release
+	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release
+
+container-windows-release: container-build-windows
+	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_WINDOWS):latest make windows-release
+
+container-release: container-build-windows container-build-fedora 
+	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_WINDOWS):latest make web-release debian-release appimage-release windows-setup-release windows-portable-release
+	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release
+
+container-local-pkgbuild: container-build-debian
+	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make local-pkgbuild

 bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock
 	./build-bom.sh
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
su-ex	cb58eccf49	New release v1.11.36-sc.3	2024-02-28 09:18:23 +01:00
su-ex	181508997e	Fix fedora container build See: https://stackoverflow.com/a/74330717/4515820	2024-02-28 09:18:23 +01:00
su-ex	d021e3be2f	New release v1.11.36-sc.2	2024-02-28 09:18:23 +01:00
su-ex	5d594f2b2f	Changed sqlcipher variable name	2024-02-28 09:18:23 +01:00
su-ex	0b863757b7	New release v1.11.36-sc.1	2024-02-28 09:18:23 +01:00
su-ex	87d8647809	Fully containerized release builds	2024-02-28 09:18:23 +01:00
su-ex	3879b01f08	Use fully qualified name here as well	2024-02-28 09:18:23 +01:00
su-ex	7cce0b17c4	This got lost while rebasing	2024-02-28 09:18:23 +01:00
su-ex	23e464c0b8	Fix containerbuilds, also always use host directory as project directory	2024-02-28 09:18:23 +01:00
SpiritCroc	842f7ba052	Fix debian container compile	2024-02-28 09:18:23 +01:00
su-ex	d7cb37b62a	Bump node version from 16 to 18	2024-02-28 09:18:23 +01:00
su-ex	c5a7b893c6	New test release v1.11.36-sc.0.test.2	2024-02-28 09:18:23 +01:00
su-ex	183883d1f9	New test release v1.11.36-sc.0.test.1	2024-02-28 09:18:23 +01:00
su-ex	5c65524d5d	New test release v1.11.35-sc.0.test.1	2024-02-28 09:18:23 +01:00
su-ex	f34f4e0c73	New test release v1.11.34-sc.0.test.1	2024-02-28 09:18:23 +01:00
su-ex	dbac606c42	New test release v1.11.33-sc.0.test.2	2024-02-28 09:18:23 +01:00
su-ex	47e586b009	New test release v1.11.33-sc.0.test.1	2024-02-28 09:18:23 +01:00
Sebastian Walz	0a0c30abd9	Update flake.lock	2024-02-28 09:18:23 +01:00
su-ex	d3d9d0351d	merge-upstream.sh: Allow merging specific version	2024-02-28 09:18:23 +01:00
Xenine	2fadcc908d	Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (52 of 52 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/zh_Hans/	2024-02-28 09:18:23 +01:00
Linerly	bd1c6dab82	Translated using Weblate (Indonesian) Currently translated at 100.0% (52 of 52 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/id/	2024-02-28 09:18:23 +01:00
waclaw66	39976378ec	Translated using Weblate (Czech) Currently translated at 100.0% (52 of 52 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/cs/	2024-02-28 09:18:23 +01:00
misibacsi	8d436d4c6f	Translated using Weblate (Hungarian) Currently translated at 50.9% (26 of 51 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/hu/	2024-02-28 09:18:23 +01:00