third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-04-14 08:07:14 +03:00
Code Issues Packages Projects Releases Wiki Activity
732 Commits 3 Branches 42 Tags
Commit Graph

732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yves Rűtschlé
4cc0867753 remove dependency of sslh-conf.c to sslhconf.cfg (fix #283) 2023-08-13 10:38:39 +02:00
Yves Rutschle
4728730abc
Merge pull request #392 from klementng/docker/transparent-patch 
Docker: ipv6 transparent patch
 2023-08-10 08:21:39 +02:00
clement
9e7b4b751f sync and resolve merge conflict 2023-08-09 23:36:01 +08:00
Clement
b11f2620ab
Add clarification on --transparent mode for docker 2023-08-09 22:57:47 +08:00
Yves Rutschle
056c283145
Merge pull request #393 from oliv3r/dev/cleanup 
container: Cleanup some style issues
 2023-08-09 08:25:22 +02:00
Olliver Schinagl
00beb9595d
container: Cleanup some style issues 
Commit 5635dc5142aa ("Enable --transparent mode for docker") made a
little bit of a mess of the Dockerfile and container-entrypoint.sh.

A few issues are, but not limited to; trailing whitespaces, incorrect
indentation, removed final newline, component sortability just to name a
few.

This MR fixes that and cleans up those files again.

One thing not touched was the enable/disablement of `set +e` to exit the
script on error. It is nicer/cleaner to solve this in a different way,
but that adds to much complexity.

While here, make the container architecture and alpine version
configurable, allowing us to build multi-arch images from the CI in the
future.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
 2023-08-08 09:01:51 +02:00
clement
27f3e9075a update examples 2023-08-08 08:11:08 +08:00
clement
3912330040 add proper ipv6 checking 2023-08-08 08:02:54 +08:00
Yves Rutschle
4cbff962db
Merge pull request #386 from oliv3r/dev/fix_version_tag 
version: Do not put a slash in the version tag
 2023-07-30 23:12:32 +02:00
Yves Rutschle
29c949e051
Merge pull request #389 from jsoref/spelling 
Spelling
 2023-07-30 23:09:03 +02:00
Yves Rutschle
e8a84e6c22
Merge pull request #388 from klementng/master 
Enable --transparent mode for docker
 2023-07-30 23:01:38 +02:00
Josh Soref
42476d3cdc spelling: version 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:13 -04:00
Josh Soref
f48f74c004 spelling: unprivileged 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:13 -04:00
Josh Soref
3af02d5c44 spelling: transparent 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:13 -04:00
Josh Soref
9e6d5cc13a spelling: theoretical 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
74fe57147b spelling: tentative 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
9acec69b9a spelling: successful 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
2a81ec0650 spelling: subsequent 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
596a4ee5b4 spelling: shortopts 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
dbfeb480fe spelling: return 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
6b8a203691 spelling: responsibility 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
95e351e150 spelling: privileges 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
4b4c585107 spelling: parenthesis 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
0217e842d2 spelling: overridden 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
877ef1d27c spelling: other 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
b1bfd5aee3 spelling: nonexistent 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
af38544316 spelling: listening 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
d4908178bf spelling: initialized 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
9deedec029 spelling: initialised 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
8ef3e8ddd8 spelling: increase 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
1eeba07396 spelling: inconsistency 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
2c48b8d83b spelling: functionally 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
44bac28718 spelling: freebind 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
f520c616cc spelling: explicitly 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
39de82ae13 spelling: echosrv 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
08bea0e15d spelling: discrepancy 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
cb52f3cdb4 spelling: deleterious 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
306164531f spelling: defining 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
40ddc4900a spelling: command 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
32aaacf4e7 spelling: argument 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
a6a73f4d32 spelling: arbitrary 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
3d959eb425 spelling: address 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
b2fd9d9daf spelling: github 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:15:36 -04:00
clement
8ff27e931f Change ordering for better layer caching 2023-07-22 06:46:00 +08:00
Clement
ecbc33ba29
Update github build link 2023-07-21 07:07:25 +08:00
clement
5635dc5142 Enable --transparent mode for docker 2023-07-21 06:58:18 +08:00
Yves Rutschle
bb76bc1d31
Merge pull request #382 from oliv3r/add_default_entrypoint 
docker: Add proper entrypoint
 2023-06-10 19:17:12 +02:00
Yves Rutschle
4a5ccb75b2
Merge pull request #384 from oliv3r/fix/parallel_builds 
CI: Do not parallelized container builds
 2023-06-10 19:15:39 +02:00
Olliver Schinagl
6672cc0f86
version: Do not put a slash in the version tag 
Many systems do not like having a `/` in the version tag. In some cases,
we generate a version as `head/branch`, which even gets amplified if one
uses `dev/feature` as a branch name.

So lets drop these slashes to avoid potential issues.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
 2023-06-09 14:00:30 +02:00
Olliver Schinagl
9dd560493a
container: Drop privileges 
A container is best served with the least amount of privileges. This
also ensures we don't have to drop anything later.

This does require running the container with elevated capabilities.

Note, that if for whatever reason, 'root' access within the container is
needed, this can easily be accomplished by running the container with
`docker run --user root:root sslh` for example.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
 2023-06-05 22:50:06 +02:00