diff --git a/3proxy-release-key.asc b/3proxy-release-key.asc new file mode 100644 index 0000000..6cc88b5 --- /dev/null +++ b/3proxy-release-key.asc @@ -0,0 +1,10 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEaogJthYJKwYBBAHaRw8BAQdA8rZ4l90kTOSrlosP0yyeX6jFGfiFFizawjS0 +vyQnmu60KjNwcm94eSByZWxlYXNlIHNpZ25pbmcgPDNwcm94eUAzcHJveHkub3Jn +PoivBBMWCgBXFiEEvHxfo3tIuOfF5ScUw2JYsMbAg6oFAmqICbYbFIAAAAAABAAO +bWFudTIsMi41KzEuMTIsMCwzAhsDBQsJCAcCAiICBhUKCQgLAgQWAgMBAh4HAheA +AAoJEMNiWLDGwIOqBHIA/iRus5VEqL+v6nYQ+GDLDUZJzMfFcnDBI+BOOhiESnTp +AP4s3uvhigRcdutxkYwSXBlJ+7wE1yZeuUmjPoJXvgNaDw== +=Ngp2 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/README.md b/README.md index 3a5ff0c..3052125 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ ### Branches -- **Master** (stable) branch - 3proxy 1.0 -- **0.9** (LTS) branch - 3proxy 0.9.9 +- **Master** (current/latest) branch - 3proxy 1.0 +- **0.9** (LTS) branch - 3proxy 0.9.9.x - **Devel** branch - 3proxy 2.0-devel (don't use it) ### Binaries (deb / rpm / Windows zip) @@ -30,7 +30,9 @@ Documentation (man pages and HTML) available with download, on https://3proxy.or ## Docker images -3 docker configurations are provided, default (full) also tagged as `:latest`, `:busybox` and `:minimal`, all refer to newest stable version. Except busybox, images are distroless and contain only binaries, you can not sh inside the container. `:busybox` contains busybox shell. +3 docker configurations are provided, default (full) also tagged as `:latest`, `:busybox` and `:minimal`, all refer to newest stable version. Except busybox, images are distroless and contain only binaries, you can not sh inside the container. `:busybox` contains busybox shell. Images are based on current (master) branch. + +Images marked as LTS (`:lts`, `:lts-busybox`, `:lts-minimal`) are built from LTS branch (0.9.9.x) ### Default image (`:latest`):