Commit Graph

52 Commits

Author SHA1 Message Date
Thales Macedo Garitezi af4141bef4 chore(oscp_crl): port OCSP and CRL features to CE repo (re4.4) 2022-11-03 10:10:16 -03:00
zhongwencool 940ceb570d Merge branch 'main-v4.4' into copy-of-main-v4.3 2022-08-19 10:53:48 +08:00
Zaiming (Stone) Shi c93dbf7624 chore: add tzdata to alpine docker image 2022-08-09 13:21:39 +02:00
Zaiming (Stone) Shi ef1b7e97bf ci: use lux from emqx-builder/4.4-19:24.1.5-3-ubuntu20.04 2022-08-03 15:33:16 +02:00
William Yang 874d308334 build: docker build from otp-23.3 2022-08-02 09:59:59 +02:00
Shawn 2ab2c39fdc chore: update emqx-builder to 4.4-18 2022-07-20 15:21:00 +08:00
Zaiming (Stone) Shi 29622558c5 ci: pin emqx-buider 4.4-12
Centos/Rockylinux had troulbe booting because OpenSSL version
was too new (1.1.1n).

builder 4.4-12 has
* Centos7: only one version (1.1.1k) OpenSSL installed
* Centos8: go back to use default OpenSSL (1.1.1k)
2022-05-26 18:04:01 +02:00
JianBo He dfea07fd0f Merge remote-tracking branch 'ce/main-v4.3' into merge-v43-to-v44 2022-04-07 09:37:47 +08:00
Thales Macedo Garitezi 11c61a7085
fix: silence grep/sed warnings in docker entrypoint 2022-04-06 09:19:19 -03:00
Zaiming (Stone) Shi 88c30e3a4f ci: bump to latest emqx-builder image 4.4-8 2022-03-31 10:14:01 +02:00
Zaiming (Stone) Shi ed9266b6c0 ci: update to latest builder image 2022-03-22 12:05:55 +01:00
Zaiming (Stone) Shi c157a16907 Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-02-26 01:05:06 +01:00
Zaiming (Stone) Shi b4836a01fd fix(docker): allow config changes in docker rebuild 2022-02-22 12:42:13 +01:00
JianBo He 521bdd20b4 Merge remote-tracking branch 'ce/main-v4.3' into merge-main-v4.3-into-v4.4 2022-02-22 11:43:46 +08:00
Rory Z 149fe7bcdf
Merge pull request #7010 from Rory-Z/build/add-new-script
build(relup): add new script for download relup base packages
2022-02-16 15:57:25 +08:00
Zaiming (Stone) Shi d2840a8aa1 docs: change EMQ X to EMQX in more descriptive info 2022-02-15 22:18:25 +01:00
Zaiming (Stone) Shi e09e5673eb docs(README): EMQ X -> EMQX 2022-02-15 16:15:25 +01:00
zhanghongtong 091398d863 build(relup): add new script for download relup base packages 2022-02-15 17:57:31 +08:00
Zaiming (Stone) Shi fd75756d5c ci: update to emqx-builder 4.4-5 (rockylinux) 2022-02-09 22:49:08 +01:00
JianBo He b297388c20 Merge branch 'main-v4.3' into merge-main-v4.3-into-v4.4 2022-01-11 10:03:28 +08:00
zhanghongtong 90a2ebfb02 build(docker): update docker build 2022-01-04 11:16:35 +08:00
Zaiming (Stone) Shi 967dc7d55e fix: portable shebang 2021-12-27 15:40:25 +01:00
zhanghongtong baf8d7d91c ci: bump otp version to 24.1.5-3 2021-12-14 10:45:08 +08:00
zhanghongtong e7c765aaa3 chore(helm): support cluster discovery by dns 2021-12-07 16:23:19 +08:00
Zaiming Shi c4b0008ebd build: delete arch suffix from alpine build-env image tag 2021-11-23 17:06:46 +01:00
Zaiming Shi 1cb6cdbd76 build: upgrade to otp sed 23.2.7.2-emqx-3
There was a typo fix in ssl app for ecdsa_secp512r1_sha512
to ecdsa_secp521r1_sha512.

Hot-beam upgrade is supported when upgrading from OTP 23.2.7.2-emqx-2
just a 'ssl_cipher' module reload.
2021-11-20 23:28:12 +01:00
Zaiming Shi 35164951e2 feat(docker): add flexible docker build
The defulat docker build (e.g. make emqx-docker) is based on alpine
image and it builds EMQ X from source code.
This is not flexible enough when we want to quickly run some tests
in a docker container.

The new docker build (e.g. make emqx-docker-testing) by default takes
the built zip package, and extract it in a very primitive base image
such as ubuntu:20.04 and centos:8
2021-11-17 08:31:35 +01:00
zhanghongtong 2251159c4f build: pin otp version to 23.3.4.9-3 and builder version to 4.4-2 2021-11-16 17:56:33 +08:00
Zaiming Shi a6032d5435 build: update default otp versions 2021-11-15 23:04:31 +01:00
zhanghongtong cace53a02b build: update docker build 2021-11-15 14:33:23 +08:00
Zaiming Shi 42695a2f9a chore: remove external contributors as maintainers
Big thank you to Raymond M Mouthaan and Huang Rui
2021-11-02 18:25:25 +01:00
zhanghongtong 75fac32c12 docs(docker): fix invalid links 2021-10-09 09:16:45 +08:00
zhanghongtong e87838f272 docs(docker): fix env name error 2021-06-24 14:46:34 +08:00
zhanghongtong f18b9a92bc chore(CI): delete needless link when build packages 2021-06-23 21:38:30 +08:00
z8674558 50f4e0617b fix(docker-entrypoint): do not mv loaded_plugins file, copy it by cat 2021-05-10 20:54:33 +09:00
Zaiming Shi cd53568f36 build: pin otp 23.2.7.2-emqx-2 2021-05-06 21:05:39 +02:00
Zaiming Shi cacb56a25c build: pin erl23.2.7.2-emqx-1 2021-04-27 21:23:40 +02:00
Zaiming Shi 4bc349b596 chore: move docker env var from Dockerfile to entrypoints 2021-04-26 11:08:23 +02:00
Zaiming Shi 6c403061db chore(docker): manual port setting for gen_rpc when start in docker 2021-04-26 15:38:56 +08:00
Zaiming Shi 5c49d5e49d chore(build): Pin Erlang/OTP 23.2.7.1-emqx-1 2021-04-17 22:15:34 +02:00
Zaiming Shi 1ee0432301 chore(build): bump to OTP-23.2.7 2021-03-18 09:04:08 +08:00
zhanghongtong 059d9fcaeb build(dashboard): get dashboard script support enterprise 2021-03-04 19:50:10 +08:00
z8674558 74b7ea34d9 feat(bin): let cuttlefish read env var 2021-02-19 01:09:06 +09:00
Yudai Kiyofuji aadd1ba11a
add shellcheck to ci (#4126)
* chore(shell): disable some shellcheck

* refactor(shell): fix shellcheck

* test(ci): add shellcheck
2021-02-04 16:51:48 +09:00
Zaiming Shi 9140eafd94 chore(docker): Start emqx in foreground mode in docker container 2021-01-29 15:30:32 +08:00
zhanghongtong 3a0f6a68be chore(docker): fix some error 2021-01-28 21:23:41 +08:00
Zaiming Shi 469afbd8bb chore(docker): update to use alpine 3.12
3.12 is our builder image base
2021-01-28 20:32:03 +08:00
Zaiming Shi 5d5617a911 chore(docker): Update port export discriptions 2021-01-28 20:32:03 +08:00
zhanghongtong fc3ebf41fa fix(docker): fix docker entryponit script
remove useless environmental variables

update the key of the environment variable

fix issue #4011
2021-01-27 18:01:50 +08:00
zhanghongtong 068c351936 chore(docker): controls the timeout of the container through environmental variables 2021-01-27 09:54:38 +08:00