Skip to content

Commit

Permalink
Merge pull request #430 from zmap/dependabot/docker/docker-runner/ubu…
Browse files Browse the repository at this point in the history
…ntu-24.04

Bump ubuntu from 16.04 to 24.04 in /docker-runner
phillip-stephens authored Jan 28, 2025
2 parents 2893613 + 97d4b41 commit 35d17d9
Showing 7 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ jobs:
integration-test:
name: Integration Test
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
steps:
- name: Check out source
uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion docker-runner/service-base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:24.04

# Base Ubuntu container with the apt cache already updated.
# Many containers will be able to use this as their base.
9 changes: 5 additions & 4 deletions integration_tests/http/container/lighttpd.conf
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ server.modules = (
"mod_alias",
"mod_compress",
"mod_redirect",
"mod_openssl",
# "mod_rewrite",
)

@@ -16,14 +17,14 @@ index-file.names = ( "index.php", "index.html", "index.lighttpd.html"
url.access-deny = ( "~", ".inc" )
static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )

compress.cache-dir = "/var/cache/lighttpd/compress/"
compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" )
deflate.cache-dir = "/var/cache/lighttpd/compress/"
deflate.mimetypes = ( "application/javascript", "text/css", "text/html", "text/plain" )

# default listening port for IPv6 falls back to the IPv4 port
## Use ipv6 if available
#include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
include_shell "/usr/share/lighttpd/create-mime.assign.pl"
include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
include_shell "/usr/share/lighttpd/create-mime.conf.pl"
include "/etc/lighttpd/conf-enabled/*.conf"

debug.log-request-handling = "enable"

8 changes: 4 additions & 4 deletions integration_tests/ipp/test.sh
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@ function test_cups() {
echo "ipp/test: Incorrect minor version. Expected 1, got $minor"
exit 1
fi
if ! [ $cups = "CUPS/2.1" ]; then
echo "ipp/test: Incorrect CUPS version. Expected CUPS/2.1, got $cups"
if ! [ $cups = "CUPS/2.4" ]; then
echo "ipp/test: Incorrect CUPS version. Expected CUPS/2.4, got $cups"
exit 1
fi
}
@@ -56,8 +56,8 @@ function test_cups_tls() {
echo "ipp/test: Incorrect minor version. Expected 1, got $minor"
exit 1
fi
if ! [ $cups = "CUPS/2.1" ]; then
echo "ipp/test: Incorrect CUPS version. Expected CUPS/2.1, got $cups"
if ! [ $cups = "CUPS/2.4" ]; then
echo "ipp/test: Incorrect CUPS version. Expected CUPS/2.4, got $cups"
exit 1
fi
if [ "$tls" = "null" ]; then
3 changes: 2 additions & 1 deletion integration_tests/telnet/container/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM zgrab2_service_base:latest

RUN apt-get install -y telnetd
RUN apt-get install -y inetutils-telnetd
COPY inetd.conf /etc/inetd.conf

WORKDIR /
COPY entrypoint.sh .
4 changes: 2 additions & 2 deletions integration_tests/telnet/container/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
set -x

while true; do
if ! /usr/sbin/in.telnetd -debug 23; then
echo "in.telnetd exited unexpectedly. Restarting..."
if ! inetutils-inetd -d; then
echo "telnetd exited unexpectedly. Restarting..."
sleep 1
fi
done
1 change: 1 addition & 0 deletions integration_tests/telnet/container/inetd.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
telnet stream tcp nowait root /usr/sbin/tcpd /usr/sbin/telnetd

0 comments on commit 35d17d9

Please sign in to comment.