41 Commits

Author SHA1 Message Date
Tomatocicier
0dbd64fddc Fix: 补充 aTrust 依赖 libproxy1v5 解决新版核心服务启动失败问题 (#470)
添加 libproxy1v5 依赖,解决 atrust 2.5.16.30 版本核心启动失败问题

---------

Co-authored-by: ll <c.lee@linux.do>
2026-03-09 10:35:03 +08:00
Shu Jiuhe
b579e9f908 support chromium version (#455) 2025-12-04 00:07:37 +08:00
MoeShin
7acc0500a1 修复捕获信号 (#385)
* 修复捕获信号
fix #334
2024-10-08 08:55:06 +08:00
Hagb
5283e76e3a Add missing dependenies and conditions 2024-07-07 10:42:19 +08:00
Hagb
ea1cf7c42a Add support for timed pinging
It helps to keep connection longer. Tested by @ethanfun.
2023-07-26 15:42:14 +08:00
Hagb
fe1fd0acb7 Fix deps when using qemu-user 2023-07-26 15:17:09 +08:00
Hagb
e13ece4db1 Use qemu-user >= 8.0.0 which fixes a memory leak bug
https://gitlab.com/qemu-project/qemu/-/issues/866

In docker-easyconnect, it was first mentioned in #128.
2023-07-26 15:16:46 +08:00
Hagb
3f1216e637 Add aTrust support (#198) 2023-07-16 01:57:35 +08:00
Hagb
676631a228 Refactor and prepare to add aTrust
- Change most of `EC` to `VPN` in the source code, since this project will not
  be only for EasyConnect
- Dehardcode
- Refactor for more than one type of Sangfor VPN
2023-07-16 01:51:01 +08:00
Hagb
b93d0d5aaf Merge branch 'master' into develop 2023-03-08 00:42:20 +08:00
Hagb
530b7d5be5 Expose 54530 port
This port is used by EasyConnect for web api, called by EasyConnect GUI
and/or web page of VPN server.

Close #143
2023-01-24 22:36:09 +08:00
Hagb
f4ef12f90b Link/copy files between ~/conf and conf directory of EC, but not link to ~/conf itself
This commit is for GUI version:
- overwrite ~/conf/ by the "immutable" configure files such as Version.xml
  that depends the version of EC; (fixes #124, #136, #156, #217)
- in the conf directory of EC, create symbolic links to files in ~/conf,
  except for "ECDomainFile", which is a unix sock used by EC and should
  not be assumed to be supported by the filesystem of ~/conf; (fixes #219)
- sync conf directory of EC to ~/conf before stoping and/or exiting
  (idea from @Einskai);
2023-01-20 03:04:46 +08:00
Hagb
5ed3825f3e Merge branch 'master' into develop 2023-01-19 00:45:53 +08:00
dhy2000
5b52478e9d 添加中文字体 && 修复 EXIT 参数 (#199)
1. 修复 usr/local/bin/start.sh 中 EXIT 无效的问题
2. 将 Dockerfile 中调用的 apt 改为 apt-get
3. 添加中文字体
2023-01-18 16:26:46 +08:00
Hagb
dc5b8000ff Add support for EasyConnect deb package inside zip file
To add support for arm64 and mips64 version of EasyConnect in
https://github.com/Hagb/docker-easyconnect/issues/25#issuecomment-1233369467
2022-09-24 12:38:39 +08:00
Hagb
f533949090 Support non-amd64 deb package of EasyConnect
Since non-amd64 deb packages of EasyConnect are proved to exist
(https://github.com/Hagb/docker-easyconnect/issues/25#issuecomment-1233369467),
the deb package should not be assume to be amd64 and architecture
specific code should be rewritten:

- Add EC_HOST build argument to tell Dockerfile the architecture of
  EasyConnect package
- Whether to install cross toolchain and qemu-user and which package
  should be install, is determined by EC_HOST and the local architecture
  now, more specifically by build-scripts/get-echost-names.sh (no longer
  hard-code amd64 cross toolchain)
- fake-hwaddr.so should follow the architecture of the EC deb, so
  fake-hwaddr/Makefile uses CC envirnoment variable instead of
  hard-coded x86_64-linux-gnu-gcc as c compiler now
- qemu_args is removed now. It was used to pass LD_PRELOAD to foreign
  binaries under qemu-user, but now we pass LD_PRELOAD to the qemu
  wrapper and wrapper will pass the LD_PRELOAD to the simulated
  binaries
2022-09-24 08:52:32 +08:00
Hagb
12409d7739 Install CA certificates for TLS certificate validation 2022-09-21 06:34:33 +08:00
Hagb
890c19f4d8 Use official electron by default even in amd64 and i386
Electron from EasyConnect is observed to have a segfault in the latest
Debian bookworm.
2022-09-21 06:11:10 +08:00
Hagb
32cac7c846 Compile tinyproxy for websocket support
Prepare for noVNC, which uses websocket.
2022-09-20 23:03:58 +08:00
Hagb
e746bc4879 Set ftp.cn.debian.org as the default mirror 2022-09-20 10:55:09 +08:00
Hagb
2fc81f4eaa Clean up build scripts 2022-09-20 10:44:43 +08:00
Hagb
007d391e4a Rename Dockerfile.fake-hwaddr to Dockerfile.build
Not only fake-hwaddr.so, there will be more things to be compiled.

- The image name of building stage is hagb/docker-easyconnect:build now
- Every independent building result will be in /root/name/, which will
  be an empty folder if turned off by user.
2022-09-20 08:58:31 +08:00
Hagb
ba974b02cd Merge branch 'master' into develop 2022-09-19 15:38:55 +08:00
redjumper
9c7a332bc6 fix danted not start if host disable ipv6 2022-08-06 01:49:11 +08:00
Hagb Green (Guo Junyu)
502bccac2f Add a workaround for qemu-user memory leak
qemu-user bug: https://gitlab.com/qemu-project/qemu/-/issues/866

https://github.com/Hagb/docker-easyconnect/issues/128#issuecomment-1074058067
2022-03-22 01:13:17 +08:00
Hagb Green (Guo Junyu)
72cbfc2ccc Refactor dockerfiles and add support for non-amd64 GUI
- split common part of dockerfiles to shell scripts in build-scripts
  folder
- add support for non-amd64 GUI by replacing the electron binary with the
  native one
2022-03-21 02:32:19 +08:00
Hagb
80920259b4 Add FAKE_HWADDR variable for rootless podman
没有 root 权限的 podman 无法设置静态的虚拟网卡的 MAC 地址,每次启动都会产生不同的 MAC 地址,从而 EasyConnect
需要提交硬件新的硬件 ID。这个 commit 用 LD_PRELOAD 劫持了用于获取 MAC 地址的 loctl 函数,将获取的 MAC 地址指定为
用户指定的 FAKE_HWADDR 环境变量的值。
2022-02-06 04:20:50 +08:00
lishoujun
532f2c3b50 change local mirror to aliyun 2022-02-03 09:37:49 +08:00
morooi
8581a0244d add Github Actions - build and push docker image to Docker Hub 2021-08-28 17:18:55 +08:00
morooi
37173f5221 vnc and vncless support HTTP&HTTPS proxy 2021-08-27 10:13:52 +08:00
Hagb Green
345eac297f Improve the method to set route for open ports
Fix #20
2021-07-19 16:01:23 +08:00
Hagb Green
a54c3e1a57 Fix #53 and #55
Thank @save95 (https://github.com/Hagb/docker-easyconnect/issues/55#issuecomment-839502334).
2021-06-04 01:57:00 +08:00
Hagb Green
5367d7152c Add logs directory as volume 2021-03-08 23:17:58 +08:00
Hagb Green
6af0c6e28f Save the whole conf directory in data volume 2020-12-22 23:47:59 +08:00
Hagb Green
408853acc8 Fix an error when the container is run.
Fix the error `rm: cannot remove '/usr/share/sangfor/EasyConnect/resources/conf/easy_connect.json': No such file or directory`
2020-12-22 23:11:07 +08:00
Hagb Green
322c61fc1c Correct variable name 2020-07-20 04:17:13 +08:00
Hagb Green
b56b261c41 Deal with EasyConnect versions 2020-07-20 03:34:48 +08:00
Hagb Green
6c601368b3 Make image smaller 2020-07-14 23:11:49 +08:00
Hagb Green
c8b5d343e6 Improve open_browser and make the image smaller 2020-05-14 11:33:50 +08:00
Hagb Green
569db8270c Deal with open_browser 2020-05-13 23:21:47 +08:00
Hagb Green
cea6a8ed8a Add Dockerfile.vncless 2020-05-12 18:14:03 +08:00