Commit Graph

94 Commits

Author SHA1 Message Date
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
Zaiming (Stone) Shi 3a5a2047e9 build: fix windows build 2022-02-21 00:53:56 +01: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
zhanghongtong cc56ad272f fix(helm): remove the default environment variables from the template 2022-02-08 14:06:39 +08:00
zhanghongtong 352635f227 fix(helm): fix deploy error 2022-02-08 10:40:16 +08:00
zhongwencool 617402ed09 Merge branch 'main-v4.4' into sync-v4.3-to-v4.4 2022-02-08 09:59:21 +08:00
Fernando Almeida b91dc1c13d fix(helm-chart): revised software name to match conventioned name
fix(helm-chart): added missing new-line from resource templates
2022-01-26 09:01:25 +00:00
Fernando Almeida 73c452c64d fix(helm-chart): replace envFromSecret with more broad extraEnvFrom
fix(helm-chart): refactored Stateful set for readability.
fix(helm-chart): added missing extra* variables to StatefulSet and README.
fix(helm-chart): added sensible defaults for extra* settings.
2022-01-25 23:43:35 +00:00
Fernando Almeida 86887e8559 fix(helm-chart): fix indentation bug in env configmap 2022-01-25 23:43:35 +00:00
Fernando Almeida 36b5982630 feat(helm-chart): fix value in WSS example 2022-01-25 23:43:35 +00:00
Fernando Almeida 43624d6407 feat(helm-chart): revised emqx env ConfigMap to allow specifying settings also using the namespaced dot notation
feat(helm-chart): updated README to include description of previous change and fix value in WSS example
2022-01-25 23:43:35 +00:00
Fernando Almeida a24e765351 feat(helm-chart): added support for shared ingress annotations
feat(helm-chart): revised README to include image.tag setting
2022-01-25 23:43:35 +00:00
Fernando Almeida 6bb2fa666d feat(helm-chart): added explicit example for enable Websocket SSL. 2022-01-25 23:43:35 +00:00
Fernando Almeida 6a5dc485e2 feat(helm-chart): split configs into multiple files for readability
feat(helm-chart): added conditional volumes in StatefulSet
feat(helm-chart): revised checksum logic to include all config
2022-01-25 23:43:35 +00:00
Fernando Almeida ec902871cf feat(helm-chart): split ingress into separate files for readability
feat(helm-chart): fix ingress to allow custom user path as need (eg. mgmt)
feat(helm-chart): revised README to include missing contents
2022-01-25 23:43:35 +00: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
Rory Z ba7b93083e
Merge pull request #6614 from Rory-Z/chore/fix-spelling-errors
chore(helm): fix spell errors
2022-01-04 17:59:04 +08:00
zhanghongtong 93abd69db1 chore(helm): fix spell errors 2022-01-04 16:19:20 +08:00
zhanghongtong 90a2ebfb02 build(docker): update docker build 2022-01-04 11:16:35 +08:00
zhanghongtong 9662eebae8 chore(helm): fix spell errors 2022-01-04 10:08:02 +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
JimMoen d76159d543 Merge remote-tracking branch 'emqx/main-v4.3' into sync-from-v4.3 2021-12-13 18:46:23 +08:00
tigercl f1c707e4de
Merge pull request #6368 from Spycsh/main-v4.3
chore: fix main-v4.3 support for networking.k8s.io/v1
2021-12-10 18:07:11 +08:00
Spycsh 5c497975a6 chore: fix main-v4.3 support for networking.k8s.io/v1 2021-12-09 21:41:55 +01:00
William Yang f72002949b
Merge pull request #6403 from qzhuyan/backport/william/4.3/systemd-restart-on-failure
Backport/william/4.3/systemd restart on failure
2021-12-09 08:38:39 +01:00
William Yang bcbb0822cf build(deb): fix postrm for checking systemd 2021-12-07 13:30:08 +01:00
William Yang 517aa39542 build(deb): deb pkg enable/disable emqx system 2021-12-07 12:48:51 +01:00
William Yang be8284666a build(deb): remove System V init 2021-12-07 12:43:07 +01:00
William Yang 16e39ffee7 build: rpm and deb use the same systemd service file 2021-12-07 12:42:59 +01:00
William Yang 79f1b8651a build(deb): drop systemV init 2021-12-07 12:42:49 +01:00
William Yang 51f1a48983 fix(systemd-start): /usr/bin/emqx is bash not sh 2021-12-07 12:42:44 +01:00
William Yang eba8c08853 fix(systemd): add restart on failure 2021-12-07 12:42:32 +01: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 (Stone) Shi 2514f474b0
Sync v4.3 to v4.4 (#6262)
* fix(http): fix duplicate http headers

* chore(appup): add appup.src

* fix(appup): fix multiply defined module in appup

* chore(appup): fix wrong version

* chore(ekka): Bump version to 0.8.1.5

* fix(update_appup): Fix warnings, add support for external repos

* build: use find command's -delete option

* ci: do not sync master branch

* build: ensure openssl11

* build: copy only libcrypto and libtinfo

* fix(trace): handler_id now always return atom

Co-authored-by: zhouzb <zhouzb@emqx.io>
Co-authored-by: k32 <10274441+k32@users.noreply.github.com>
2021-11-23 09:33:20 +08: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 0b3037a571 build: ensure openssl11 2021-11-19 12:39:59 +01:00
Zaiming (Stone) Shi f30e21b4d6
Merge pull request #6188 from zmstone/feat-add-flexible-docker-build
feat(docker): add flexible docker build
2021-11-17 09:24:14 +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
Zaiming Shi a070708e8d build: Move otp version number to RPM's release part 2021-11-16 19:14:15 +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 3f1fc64a98 build: fix source rpm package name 2021-11-16 01:10:52 +01:00
Zaiming Shi c97c6aefc9 build: rename zip package and rpm deb packages 2021-11-16 00:59:28 +01:00