Commit graph

224 commits

Author SHA1 Message Date
Erik Moeller
8bdafce660
Appease linter 2023-04-24 11:50:58 +03:00
Alex Pyrgiotis
1ae7581df6
Use a different certificate for MacOS
Replace our reference to an Apple development certificate with a
Developer ID Application certificate. The former is not accepted during
the code notarization phase, whereas the latter is.
2023-04-24 11:50:58 +03:00
deeplow
592009d4d1
Fix build_app_bundle() (missing arguments) 2023-04-14 08:50:48 +01:00
deeplow
18557f88fc
Allow "create-dmg" to be in other places
If installed with homebrew, create-dmg will be installed at a different
location. It makes more sense to use the 'which' utility to find where
it is.
2023-04-14 08:48:07 +01:00
deeplow
21875714b8
Update apple development key ID 2023-04-14 08:48:05 +01:00
deeplow
1c0dfb45f5
Update Apple account to FPF's Developer ID 2023-04-10 10:41:03 +01:00
deeplow
3f23010394
Redo macOS build-app.py and add --codesign-only opt
Redoes the build-app.py script to add an option to sign only an already-
produced app bundle.
2023-04-10 10:40:01 +01:00
Alex Pyrgiotis
7fe01d6470
install/windows: Remove -rc identifiers from version
Remove any -rc identifiers (e.g., 0.4.1-rc3) from the Dangerzone
version, if it includes them. If we don't remove them, then building
the MSI for Windows will fail as follows:

    error CNDL0108: The Product/@Version attribute's value, '0.4.1-rc3',
    is not a valid version. Legal version values should look like
    'x.x.x.x' where x is an integer from 0 to 65534.
2023-04-03 19:35:19 +03:00
Alex Pyrgiotis
d768099912
Grab just the image ID
When building the image, grab the image id using `-q`, which removes all
the decorations in the output and just keeps the image ID.
2023-03-09 19:04:59 +02:00
Alex Pyrgiotis
a33dcfbb51
Replace First Look Media references
Update several references to First Look Media in the code, to better
reflect the current status, where Freedom of the Press Foundation has
taken over the stewardship of the project.

Fixes #343
2023-03-08 18:40:55 +02:00
Alex Pyrgiotis
4668443be6
install: Use the full image tag
Use the full image tag (dangerzone.rocks/dangerzone:latest) when
building the image. Else, we risk creating a `share/image-id.txt` file
with multiple IDs in it, if we have another
`dangerzone.rocks/dangerzone` image (with a different tag) in our dev
environment.
2023-03-08 17:40:26 +02:00
deeplow
fb85421db8
Fix Windows build for PySide6 (illegal file names)
Building the `.msi` on Windows was failing in the `candle.exe` step due
to some files in the PySide6 library being too long (PySide6/examples)
or having illegal character (`+`) in their file names
(PySide6/qml/QtQuick).

Skipping copying these files to the `.msi` fixes the issue. Skipping
`examples/` should be of no impact since they're just examples and
skipping `qml/QtQuick` shouldn't cause issues because we don't use QML.

Reverts commit `bbbf822` and adapts it from PySide2 to PySide6.
2023-02-23 09:12:02 +00:00
deeplow
9b3d98b20b
Build arm64 docker image for arm-based Macs
Remove --patform args completely so that by default we build natively
on each platform.

Partial fix for #50
2023-02-16 10:59:00 +00:00
Maeve Andrews
c26326450b
Add a --distro option to build-deb.py
Add an optional --distro argument to build-deb.py, to specify the Debian
version in the package name, which currently is "1". This option may
prove useful when publishing packages to freedomofpress/apt-tools-prod,
where packages from different distros with the same names but different
contents are not accepted.
2023-02-14 15:49:51 +02:00
deeplow
bbbf8224f1
install: Remove PySide2-related code for Windows 2023-01-30 11:42:24 +00:00
Alex Pyrgiotis
4eead90c00
install: Fail early when image build fails 2023-01-16 18:48:09 +02:00
Alex Pyrgiotis
624d480cca
install: Do not create intermediate tarfile for container
Skip the creation of the `share/container.tar` file, since it's not used
anywhere. Instead, pipe our `docker/podman save` invocations to `gzip`
directly, which will compress the tarfile on the fly. This saves both
time and disk space.
2023-01-16 18:48:08 +02:00
Alex Pyrgiotis
a0503c8c40
install: Do not create Debian source package twice 2023-01-16 18:48:08 +02:00
deeplow
5761255b56
Fix Python version in Windows build scripts
Windows python build scripts were still referencing the old python 3.9
version, whereas 3.10 is the currently used one in the dev environment.
2022-12-01 14:58:29 +00:00
Alex Pyrgiotis
1daaafe2a3
install: Introduce a script for installing Podman
Introduce a script for installing Podman in Ubuntu Focal, in
environments that may, or may not, have sudo installed.

Also, update our CircleCI configuration to use this script when
installing Podman.
2022-11-10 16:35:48 +02:00
Micah Lee
383bd5dbed
Enforce code style 2022-08-26 14:12:01 -07:00
Micah Lee
6713cce503
Updates to the macOS and Windows build scripts and documentation 2022-08-26 14:06:06 -07:00
deeplow
4d8e4c53e3
sort imports with isort linter 2022-08-22 10:15:26 +01:00
Guthrie McAfee Armstrong
395eba0a74
Remove requests dependency 2022-08-19 15:16:14 +01:00
Micah Lee
0cf514eba7
Fix version path 2021-12-13 15:32:35 -08:00
Micah Lee
a710178d75
Add package scripts for windows 2021-12-13 15:25:41 -08:00
Micah Lee
bc8b9d62b4
Switch Windows package from pyinstaller to cx_freeze 2021-12-13 15:23:45 -08:00
Micah Lee
42f8fb9e2f
Rename the container in CircleCI 2021-11-29 16:04:20 -08:00
Micah Lee
433639d51f
Explicitly build linux/amd64 container 2021-11-29 15:51:18 -08:00
Micah Lee
2de2b6dca5
Rename dangerzone-converter to container 2021-11-29 15:30:21 -08:00
Micah Lee
387a742487
Delete the .tar after compressing in Windows, and fix Windows installer 2021-11-24 16:38:15 -08:00
Micah Lee
65a66b78cd
Remove indent line, this function is deprecated 2021-11-24 12:36:18 -08:00
Micah Lee
61839f5b24
Change multistep windows build into one step 2021-11-24 12:21:38 -08:00
Micah Lee
4572922042
Update Windows code signing 2021-11-24 11:42:02 -08:00
Micah Lee
edbd3aa88a
Set the path in macOS, so it can find /usr/local/bin/docker 2021-11-23 16:16:55 -08:00
Micah Lee
b3b52c3963
Rename build scripts 2021-11-23 15:47:25 -08:00
Micah Lee
7441796fbe
Support Windows 2021-11-23 15:39:23 -08:00
Micah Lee
9acfd2764e
Make the new code work in linux 2021-11-22 18:51:47 -05:00
Micah Lee
a54e19fe11
Get WaitingWidget to properly check for and install the image 2021-11-22 14:37:53 -08:00
Micah Lee
83759d1a33
Delete vm-builder folder, and make build-image.sh build the dangerzone image 2021-11-22 14:23:17 -08:00
Micah Lee
8248d58f21
Copy vpnkit from Docker Desktop instead of compiling on M1 Macs 2021-11-18 16:25:12 -08:00
Micah Lee
f1cbbdf43c
Start to support building for M1 chips, using Docker Desktop instead of vagrant 2021-11-18 15:53:00 -08:00
Micah Lee
47d6eb0d8b
Build vpnkit and hyperkit from source, remove Docker Desktop dependency to build, and add --allow-vm-login flag 2021-11-18 11:47:51 -08:00
Micah Lee
fd1dec7438
Move vm-builder up a dir, and start replacing Docker Desktop with building hyperkit and vpnkit manually 2021-11-17 13:41:45 -08:00
Micah Lee
27a7f86641 Change how the VM initializes, to work in virtualbox 2021-08-17 13:44:52 -07:00
Micah Lee
1432ca75fc Base the VM image off Alpine 3.14.1, update the alpine profile to be based off virt instead of standard 2021-08-13 15:02:23 -07:00
Micah Lee
46681bc771 Start making Windows VM work with virtualbox 2021-08-09 14:05:07 -07:00
Micah Lee
173f31ff41 Start porting VM to Windows 2021-08-09 12:04:17 -07:00
Micah Lee
4a4deeb64f
Add support for non-VM containers again 2021-08-04 15:02:49 -07:00
Micah Lee
588206a9e8
Start implementing built-in container in Linux, without a VM 2021-08-04 14:42:46 -07:00
Micah Lee
ee5acf64b2
Make converter handle failure properly 2021-07-30 13:01:54 -07:00
Micah Lee
9fcb304545
Lockdown ssh, and also temporarily comment out deleting containers on ISO build 2021-07-27 10:54:17 -07:00
Micah Lee
2c2f87593c
Keep ssh tunnel open with autossh, and give root user ssh keys so unprivileged user cant access the host 2021-07-14 11:36:13 -07:00
Micah Lee
a7f3eb9b43
Make container mount and unmount dirs from the host 2021-07-01 17:14:48 -07:00
Micah Lee
2904d44aad
Start making it possible to execute podman inside the VM 2021-07-01 16:45:25 -07:00
Micah Lee
29a148d211
Successfully set up reverse ssh forward system, allowing the host to run commands on the guest over ssh 2021-07-01 15:32:07 -07:00
Micah Lee
1c39895206
Refactor how VM image is created to split it into different files, and write ssh-to-host.py script 2021-07-01 11:02:08 -07:00
Micah Lee
da75559e3a
Start working on ssh reverse tunnel stuff 2021-06-30 16:21:40 -07:00
Micah Lee
9158d02669
Successfully boot VM 2021-06-30 14:27:26 -07:00
Micah Lee
720810da5d
Enable the sandbox 2021-06-30 12:03:09 -07:00
Micah Lee
d7cd8584f2
Split Vm class from SysTray, and make it launch hyperkit 2021-06-30 10:45:38 -07:00
Micah Lee
e8f7d96f90
Fix building VM ISO, and start implementing start_vm 2021-06-29 17:37:00 -07:00
Micah Lee
7b2211fc1f
Rename rip_docker to install/vm-builder, and start making a build script that uses it 2021-06-29 17:01:47 -07:00
Micah Lee
57f9c6bf2c
Fix pyinstaller path 2021-06-29 16:53:58 -07:00
Micah Lee
cf28d47ffc
Merge branch 'master' into 118_rip_docker_desktop 2021-06-29 16:52:25 -07:00
Micah Lee
f4739e749a
Start adding systray 2021-06-29 16:52:10 -07:00
Micah Lee
b92ae1c592
Merge branch 'windows' 2021-06-22 12:10:04 -07:00
Micah Lee
e8a348419f
Must remove InstallExecuteSequence for Wix package to build 2021-06-22 12:03:29 -07:00
Micah Lee
c6c011f235
Change Wix config to allow upgrades 2021-06-22 11:51:35 -07:00
Micah Lee
d24d593094
Rip out everything required to make dangerzone-container run with root privs 2021-06-17 14:16:27 -07:00
Micah Lee
d50b0c1bed
Remove docker dependency in Linux and replace with podman 2021-06-17 14:12:44 -07:00
Micah Lee
ebd3a841dc
Fix finding version when building Windows installer 2021-06-16 15:17:11 -07:00
Micah Lee
2d53acfe07
Make CLI symlink in macOS build 2021-06-16 14:29:46 -07:00
Micah Lee
26adc1b3ab
Fix finding version in PyInstaller spec 2021-06-16 14:06:26 -07:00
Micah Lee
a437906d1d
Version bump to 0.2, update changelog, and fix all linux builds 2021-06-16 11:16:38 -07:00
Micah Lee
46c73329a5
Switch from termcolor to colorama 2021-06-10 10:24:28 -07:00
Micah Lee
4c7bde09c7
Fix macOS close immediately bug 2021-02-10 15:49:05 -08:00
Micah Lee
ffb622c183
Fix codesigning 2020-12-30 14:17:03 -08:00
Micah Lee
d7e79385d2
Use python 3.9 for macOS, because of PyInstaller update, and make build_app.py executable 2020-12-28 15:27:35 -08:00
Micah Lee
76c74df71a
Fix CircleCI and test in Fedora 2020-10-29 17:01:47 -07:00
Micah Lee
ee215a4870
Update macOS instructions for installing python, and fix how DMG gets created 2020-10-29 15:54:12 -07:00
Micah Lee
0067f37494
Fix macOS build script, and install create-dmg from homebrew instead of npm 2020-10-29 14:16:04 -07:00
Micah Lee
26ea568080
Don't put the start menu shortcut in a folder 2020-10-29 11:10:48 -07:00
Micah Lee
87be2bbc7d
Fix detecting if dangerzone or dangerzone-container is running in Windows, update docker.exe path, fix Windows build scripts to include to docker-container.exe symlink 2020-10-29 10:43:23 -07:00
Micah Lee
1116c9a029
Make Windows docker link clickable, and make Windows installer add a start menu shortcut 2020-10-28 16:48:16 -07:00
Micah Lee
10dfc1441b
Build the Wix wxs file on the fly 2020-10-28 12:13:09 -07:00
Micah Lee
71fff406d2
Add python3-termcolor dependency 2020-10-14 09:45:20 -07:00
Micah Lee
e798da9a99
Version bump to 0.1.2 and update changelog 2020-04-09 16:23:15 -07:00
Micah Lee
f7532ecacc
Update fedora build script 2020-03-17 11:43:14 -07:00
Micah Lee
2674f1457a
Version bump to 0.1.1 2020-03-17 11:11:47 -07:00
Micah Lee
b46ad704e4
When making macOS app bundle, make symlink with relative path instead of absolute 2020-03-16 17:26:18 -07:00
Micah Lee
4eba0087e7
Version bump to 0.1.1.dev1 2020-03-16 17:07:43 -07:00
Micah Lee
d62995366f
Allow fedora to use either docker or docker-ce 2020-03-16 17:02:07 -07:00
Micah Lee
4d6de4f077
Create dangerzone-container.exe symlink in Windows when creating the binary and installer 2020-03-16 16:14:49 -07:00
Micah Lee
1f7f29a456
Create dangerzone-container symlink when building the Mac app bundle 2020-03-16 15:11:26 -07:00
Micah Lee
cf367adcfa
This creates a separate script dangerzone-container which is a wrapper for running the container. This lets us run dangerzone as unprivileged, but dangerzone-container as privileged, to avoid adding the user to the dangerzone group. 2020-03-13 16:49:53 -07:00
Gaurav Sitlani
bacc2d714e
Added podman dependency for Fedora (#42) 2020-03-12 14:50:21 -07:00
Eike Rathke
6186538f70 Fix macOS app bundle ODF extensions .ods .odt
application/vnd.oasis.opendocument.spreadsheet  ods
application/vnd.oasis.opendocument.text         odt
2020-03-11 22:27:38 +01:00
Micah Lee
8845ac6440
Allow opening docm files 2020-03-03 19:23:46 +05:30
Micah Lee
271ac9641b
Version bump to 0.1 2020-02-28 17:38:49 -08:00
Micah Lee
bb68430db5
Remove more references to container 2020-02-27 16:06:41 -08:00
Micah Lee
2f77159e3f
Version bump to 0.0.3 2020-02-27 15:45:02 -08:00
Micah Lee
e7f5ce0c38
Remove git submodule, and all references to the container 2020-02-27 15:21:30 -08:00
Micah Lee
2503fde829
Update release docs, fix bug in windows build script 2020-02-27 14:56:32 -08:00
Micah Lee
fc2fcf6bd3
Version bump to 0.0.2 2020-02-27 09:56:03 -08:00
Micah Lee
2f9d368beb
Add code signing to windows release 2020-02-24 16:51:59 -08:00
Micah Lee
75f4f828a2
Change version in Windows installer to 0.0.1 as well 2020-02-24 16:44:55 -08:00
Micah Lee
7113ac3c02
Add missing deps: dh-python for debian, python3-pyxdg for fedora, and python3-requests for both 2020-02-24 15:58:03 -08:00
Micah Lee
45f78637af
Add build script and instructions for fedora 2020-02-21 16:04:11 -08:00
Micah Lee
f6370383d5
Fix path to macOS icons in pyinstaller spec 2020-02-21 09:28:10 -08:00
Micah Lee
1829bd64f5
Oops, add the correct variables for the installer UI 2020-02-20 16:59:35 -08:00
Micah Lee
583f8de8ff
Move Windows icon into share, and make get_resource_path work in Windows 2020-02-20 13:41:56 -08:00
Micah Lee
264429f313
Call the Windows build script build.bat, and update build instructions 2020-02-20 12:26:24 -08:00
Micah Lee
e796f9aaea
Finished making a nice WiX installer, but still missing codesigning 2020-02-20 12:23:39 -08:00
Micah Lee
2ae39db1c1
Improve make_installer.bat script so that it works in the build dir, and outputs into the dist dir 2020-02-20 11:51:06 -08:00
Micah Lee
72de53c0c0
Begin making a WiX msi installer 2020-02-20 11:37:24 -08:00
Micah Lee
8974afa2b5
Working on making pyinstaller work for Windows as well as Mac, sharing the same pyinstaller.spec 2020-02-12 16:50:21 -08:00
Micah Lee
fa524d78b6
Finish making macOS installer 2020-02-10 14:50:24 -08:00
Micah Lee
5c99796496
Make linux version open all MIME types 2020-01-13 14:41:01 -08:00
Micah Lee
b6696dab52
Commit the pyinstaller.spec, including CFBundleDocumentTypes array to open all document formats 2020-01-13 14:16:21 -08:00
Micah Lee
e6752a9aec
Add dangerzone document icon 2020-01-13 14:10:02 -08:00
Micah Lee
810fa31a69
Start adding Mac app bundle packaging 2020-01-13 12:41:14 -08:00
Micah Lee
e4e5f71419
Make passing in the filename an argument instead of an option, so desktop file will work properly 2020-01-07 17:20:14 -08:00
Micah Lee
e85191b498
Debian packaging 2020-01-07 17:10:54 -08:00