From b7e204d7bab5cc8377f70b0f3223dc886b49a88c Mon Sep 17 00:00:00 2001 From: ktock Date: Tue, 13 Apr 2021 21:27:28 +0900 Subject: [PATCH] Add mariadb:10.5 and wordpress:5.7 to ghcr.io/stargz-containers Signed-off-by: Kohei Tokunaga --- docs/pre-converted-images.md | 4 ++++ script/benchmark/hello-bench/src/hello.py | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/docs/pre-converted-images.md b/docs/pre-converted-images.md index 31e996a7f..1524feaa6 100644 --- a/docs/pre-converted-images.md +++ b/docs/pre-converted-images.md @@ -53,3 +53,7 @@ Additionally, image names listed in `Image Name` contain the following suffixes |`ghcr.io/stargz-containers/tomcat:10.0.0-jdk15-openjdk-buster-esgz`|Code execution until up and ready message (`Server startup`) is printed| |`ghcr.io/stargz-containers/postgres:13.1-org`|Code execution until up and ready message (`database system is ready to accept connections`) is printed| |`ghcr.io/stargz-containers/postgres:13.1-esgz`|Code execution until up and ready message (`database system is ready to accept connections`) is printed| +|`ghcr.io/stargz-containers/wordpress:5.7-org`|Code execution until up and ready message (`apache2 -D FOREGROUND`) is printed| +|`ghcr.io/stargz-containers/wordpress:5.7-esgz`|Code execution until up and ready message (`apache2 -D FOREGROUND`) is printed| +|`ghcr.io/stargz-containers/mariadb:10.5-org`|Code execution until up and ready message (`mysqld: ready for connections`) is printed| +|`ghcr.io/stargz-containers/mariadb:10.5-esgz`|Code execution until up and ready message (`mysqld: ready for connections`) is printed| diff --git a/script/benchmark/hello-bench/src/hello.py b/script/benchmark/hello-bench/src/hello.py index 8cdcfa548..ed7b12aed 100755 --- a/script/benchmark/hello-bench/src/hello.py +++ b/script/benchmark/hello-bench/src/hello.py @@ -99,6 +99,9 @@ class BenchRunner: 'tomcat:10.0.0-jdk15-openjdk-buster': RunArgs(waitline='Server startup'), 'postgres:13.1': RunArgs(waitline='database system is ready to accept connections', env={'POSTGRES_PASSWORD': 'abc'}), + 'mariadb:10.5': RunArgs(waitline='mysqld: ready for connections', + env={'MYSQL_ROOT_PASSWORD': 'abc'}), + 'wordpress:5.7': RunArgs(waitline='apache2 -D FOREGROUND'), } CMD_STDIN = {'php:7.3.8': RunArgs(stdin='php -r "echo \\\"hello\\n\\\";"; exit\n'), @@ -123,6 +126,7 @@ class BenchRunner: Bench('rethinkdb:2.3.6', 'database'), Bench('postgres:13.1', 'database'), Bench('redis:5.0.5', 'database'), + Bench('mariadb:10.5', 'database'), Bench('python:3.9', 'language'), Bench('golang:1.12.9', 'language'), Bench('gcc:10.2.0', 'language'), @@ -135,6 +139,7 @@ class BenchRunner: Bench('jenkins:2.60.3'), Bench('node:13.13.0'), Bench('tomcat:10.0.0-jdk15-openjdk-buster', 'web-server'), + Bench('wordpress:5.7', 'web-server'), ]]) def __init__(self, repository='docker.io/library', srcrepository='docker.io/library', mode=LEGACY_MODE, optimizer=DEFAULT_OPTIMIZER, puller=DEFAULT_PULLER, pusher=DEFAULT_PUSHER):