Use alpine as a base image
So far ubuntu:18.04 was used as a base images for all container images
used in this project. Ubuntu requires quite a lot of disk space, making
the container images quite large.
This change adapts the containers to use the alpine:3.10.0 image as
a base image. Alpine is a lot smaller leading to images that are about
25-30 % of the size of the old ones.
Change-Id: Ib6aa285bdda12870f5e208aa2ea01cd22c9180cd
diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md
index 6d08399..0e5fc5f 100644
--- a/Documentation/developer-guide.md
+++ b/Documentation/developer-guide.md
@@ -57,6 +57,8 @@
rm -rf /var/lib/apt/lists/*
```
+In Alpine based images use the `--no-cache`-flag of `apk`.
+
- **Clean up temporary files immediately:** If temporary files are created by a
command remove them in the same command chain.
diff --git a/container-images/apache-git-http-backend/Dockerfile b/container-images/apache-git-http-backend/Dockerfile
index 0253697..1613007 100644
--- a/container-images/apache-git-http-backend/Dockerfile
+++ b/container-images/apache-git-http-backend/Dockerfile
@@ -1,29 +1,19 @@
FROM base:latest
# Install apache2
-RUN apt-get update && \
- apt-get -y install \
- apache2 && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists/* && \
- a2enmod \
- cgi \
- alias \
- env \
- ssl && \
- rm -f /etc/apache2/sites-enabled/000-default.conf
+RUN apk update && \
+ apk add --no-cache \
+ apache2 \
+ apache2-ctl \
+ apache2-utils \
+ apache2-ssl \
+ git-daemon
# Configure git-http-backend
-COPY git-https-backend.conf /etc/apache2/sites-available/
-COPY git-http-backend.conf /etc/apache2/sites-available/
-RUN ln -s \
- /etc/apache2/sites-available/git-https-backend.conf \
- /etc/apache2/sites-enabled/git-https-backend.conf && \
- ln -s \
- /etc/apache2/sites-available/git-http-backend.conf \
- /etc/apache2/sites-enabled/git-http-backend.conf
-RUN sed -i -e 's/APACHE_RUN_USER=www-data/APACHE_RUN_USER=gerrit/' /etc/apache2/envvars && \
- sed -i -e 's/APACHE_RUN_GROUP=www-data/APACHE_RUN_GROUP=users/' /etc/apache2/envvars
+COPY config/git-https-backend.conf /etc/apache2/conf.d/
+COPY config/git-http-backend.conf /etc/apache2/conf.d/
+COPY config/envvars /usr/sbin/envvars
+COPY config/httpd.conf /etc/apache2/httpd.conf
COPY tools/start /var/tools/start
COPY tools/create_repo.sh /var/cgi/create_repo.sh
@@ -34,4 +24,4 @@
chown -R gerrit:users /var/log/apache2
# Start
-ENTRYPOINT ["/var/tools/start"]
+ENTRYPOINT ["ash", "/var/tools/start"]
diff --git a/container-images/apache-git-http-backend/README.md b/container-images/apache-git-http-backend/README.md
index 8272b34..1284648 100644
--- a/container-images/apache-git-http-backend/README.md
+++ b/container-images/apache-git-http-backend/README.md
@@ -8,7 +8,7 @@
* base image
* Apache webserver
* Apache configurations for http and https
-* git (via base image)
+* git (via base image) and git-deamon for git-http-backend
* `tools/create_repo.sh`: cgi script to enable remote creation of new git
repository over http. This is triggered by the Gerrit replication plugin
if a new repository on the Gerrit master does not yet exist in a Gerrit slave,
@@ -21,8 +21,8 @@
## Setup and Configuration
-* install Apache webserver
-* configure Apache for http and/or https
+* install Apache webserver, additional Apache tools and git daemon
+* configure Apache
* install cgi script
* map volumes
diff --git a/container-images/apache-git-http-backend/config/envvars b/container-images/apache-git-http-backend/config/envvars
new file mode 100644
index 0000000..97d9f7e
--- /dev/null
+++ b/container-images/apache-git-http-backend/config/envvars
@@ -0,0 +1,43 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+# envvars-std - default environment variables for apachectl
+#
+# This file is generated from envvars-std.in
+#
+if test "x$LD_LIBRARY_PATH" != "x" ; then
+ LD_LIBRARY_PATH="/usr/lib:$LD_LIBRARY_PATH"
+else
+ LD_LIBRARY_PATH="/usr/lib"
+fi
+export LD_LIBRARY_PATH
+#
+
+# this won't be correct after changing uid
+unset HOME
+
+# Since there is no sane way to get the parsed apache2 config in scripts, some
+# settings are defined via environment variables and then used in apache2ctl,
+# /etc/init.d/apache2, /etc/logrotate.d/apache2, etc.
+export APACHE_RUN_USER=gerrit
+export APACHE_RUN_GROUP=users
+# Only /var/log/apache2 is handled by /etc/logrotate.d/apache2.
+export APACHE_LOG_DIR=/var/log/apache2$SUFFIX
+
+## Uncomment the following line to use the system default locale instead:
+#. /etc/default/locale
+
+export LANG
diff --git a/container-images/apache-git-http-backend/git-http-backend.conf b/container-images/apache-git-http-backend/config/git-http-backend.conf
similarity index 96%
rename from container-images/apache-git-http-backend/git-http-backend.conf
rename to container-images/apache-git-http-backend/config/git-http-backend.conf
index ba42d31..0996b15 100644
--- a/container-images/apache-git-http-backend/git-http-backend.conf
+++ b/container-images/apache-git-http-backend/config/git-http-backend.conf
@@ -13,7 +13,7 @@
SetEnv GIT_PROJECT_ROOT /var/gerrit/git
SetEnv GIT_HTTP_EXPORT_ALL
- ScriptAlias /git/ /usr/lib/git-core/git-http-backend/
+ ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/
ScriptAliasMatch "(?i)^/new/(.*)" "/var/cgi/create_repo.sh"
Alias /git /var/gerrit/git
diff --git a/container-images/apache-git-http-backend/git-https-backend.conf b/container-images/apache-git-http-backend/config/git-https-backend.conf
similarity index 96%
rename from container-images/apache-git-http-backend/git-https-backend.conf
rename to container-images/apache-git-http-backend/config/git-https-backend.conf
index 6d1c961..4ee3ea4 100644
--- a/container-images/apache-git-http-backend/git-https-backend.conf
+++ b/container-images/apache-git-http-backend/config/git-https-backend.conf
@@ -13,7 +13,7 @@
SetEnv GIT_PROJECT_ROOT /var/gerrit/git
SetEnv GIT_HTTP_EXPORT_ALL
- ScriptAlias /git/ /usr/lib/git-core/git-http-backend/
+ ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/
ScriptAliasMatch "(?i)^/new/(.*)" "/var/cgi/create_repo.sh"
Alias /git /var/gerrit/git
diff --git a/container-images/apache-git-http-backend/config/httpd.conf b/container-images/apache-git-http-backend/config/httpd.conf
new file mode 100644
index 0000000..dab4881
--- /dev/null
+++ b/container-images/apache-git-http-backend/config/httpd.conf
@@ -0,0 +1,471 @@
+# This is the main Apache HTTP server configuration file. It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
+# In particular, see
+# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do. They're here only as hints or reminders. If you are unsure
+# consult the online docs. You have been warned.
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path. If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "logs/access_log"
+# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
+# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log"
+# will be interpreted as '/logs/access_log'.
+
+#
+# ServerTokens
+# This directive configures what you return as the Server HTTP response
+# Header. The default is 'Full' which sends information about the OS-Type
+# and compiled in modules.
+# Set to one of: Full | OS | Minor | Minimal | Major | Prod
+# where Full conveys the most information, and Prod the least.
+#
+ServerTokens OS
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# Do not add a slash at the end of the directory path. If you point
+# ServerRoot at a non-local disk, be sure to specify a local disk on the
+# Mutex directive, if file-based mutexes are used. If you wish to share the
+# same ServerRoot for multiple httpd daemons, you will need to change at
+# least PidFile.
+#
+ServerRoot /var/www
+
+#
+# Mutex: Allows you to set the mutex mechanism and mutex file directory
+# for individual mutexes, or change the global defaults
+#
+# Uncomment and change the directory if mutexes are file-based and the default
+# mutex file directory is not on a local disk or is not appropriate for some
+# other reason.
+#
+# Mutex default:/run/apache2
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, instead of the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to
+# prevent Apache from glomming onto all bound IP addresses.
+#
+#Listen 12.34.56.78:80
+Listen 80
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+#LoadModule mpm_event_module modules/mod_mpm_event.so
+LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
+#LoadModule mpm_worker_module modules/mod_mpm_worker.so
+LoadModule authn_file_module modules/mod_authn_file.so
+#LoadModule authn_dbm_module modules/mod_authn_dbm.so
+#LoadModule authn_anon_module modules/mod_authn_anon.so
+#LoadModule authn_dbd_module modules/mod_authn_dbd.so
+#LoadModule authn_socache_module modules/mod_authn_socache.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+LoadModule authz_user_module modules/mod_authz_user.so
+#LoadModule authz_dbm_module modules/mod_authz_dbm.so
+#LoadModule authz_owner_module modules/mod_authz_owner.so
+#LoadModule authz_dbd_module modules/mod_authz_dbd.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+#LoadModule auth_form_module modules/mod_auth_form.so
+#LoadModule auth_digest_module modules/mod_auth_digest.so
+#LoadModule allowmethods_module modules/mod_allowmethods.so
+#LoadModule file_cache_module modules/mod_file_cache.so
+#LoadModule cache_module modules/mod_cache.so
+#LoadModule cache_disk_module modules/mod_cache_disk.so
+#LoadModule cache_socache_module modules/mod_cache_socache.so
+#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+#LoadModule socache_dbm_module modules/mod_socache_dbm.so
+#LoadModule socache_memcache_module modules/mod_socache_memcache.so
+#LoadModule socache_redis_module modules/mod_socache_redis.so
+#LoadModule watchdog_module modules/mod_watchdog.so
+#LoadModule macro_module modules/mod_macro.so
+#LoadModule dbd_module modules/mod_dbd.so
+#LoadModule dumpio_module modules/mod_dumpio.so
+#LoadModule echo_module modules/mod_echo.so
+#LoadModule buffer_module modules/mod_buffer.so
+#LoadModule data_module modules/mod_data.so
+#LoadModule ratelimit_module modules/mod_ratelimit.so
+LoadModule reqtimeout_module modules/mod_reqtimeout.so
+#LoadModule ext_filter_module modules/mod_ext_filter.so
+#LoadModule request_module modules/mod_request.so
+#LoadModule include_module modules/mod_include.so
+LoadModule filter_module modules/mod_filter.so
+#LoadModule reflector_module modules/mod_reflector.so
+#LoadModule substitute_module modules/mod_substitute.so
+#LoadModule sed_module modules/mod_sed.so
+#LoadModule charset_lite_module modules/mod_charset_lite.so
+#LoadModule deflate_module modules/mod_deflate.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule log_config_module modules/mod_log_config.so
+#LoadModule log_debug_module modules/mod_log_debug.so
+#LoadModule log_forensic_module modules/mod_log_forensic.so
+#LoadModule logio_module modules/mod_logio.so
+LoadModule env_module modules/mod_env.so
+#LoadModule mime_magic_module modules/mod_mime_magic.so
+#LoadModule expires_module modules/mod_expires.so
+LoadModule headers_module modules/mod_headers.so
+#LoadModule usertrack_module modules/mod_usertrack.so
+#LoadModule unique_id_module modules/mod_unique_id.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+#LoadModule remoteip_module modules/mod_remoteip.so
+#LoadModule session_module modules/mod_session.so
+#LoadModule session_cookie_module modules/mod_session_cookie.so
+#LoadModule session_crypto_module modules/mod_session_crypto.so
+#LoadModule session_dbd_module modules/mod_session_dbd.so
+#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
+#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
+#LoadModule dialup_module modules/mod_dialup.so
+#LoadModule http2_module modules/mod_http2.so
+LoadModule unixd_module modules/mod_unixd.so
+#LoadModule heartbeat_module modules/mod_heartbeat.so
+#LoadModule heartmonitor_module modules/mod_heartmonitor.so
+LoadModule status_module modules/mod_status.so
+LoadModule autoindex_module modules/mod_autoindex.so
+#LoadModule asis_module modules/mod_asis.so
+#LoadModule info_module modules/mod_info.so
+#LoadModule suexec_module modules/mod_suexec.so
+<IfModule !mpm_prefork_module>
+ LoadModule cgid_module modules/mod_cgid.so
+</IfModule>
+<IfModule mpm_prefork_module>
+ LoadModule cgi_module modules/mod_cgi.so
+</IfModule>
+#LoadModule vhost_alias_module modules/mod_vhost_alias.so
+#LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule dir_module modules/mod_dir.so
+#LoadModule actions_module modules/mod_actions.so
+#LoadModule speling_module modules/mod_speling.so
+#LoadModule userdir_module modules/mod_userdir.so
+LoadModule alias_module modules/mod_alias.so
+#LoadModule rewrite_module modules/mod_rewrite.so
+
+LoadModule negotiation_module modules/mod_negotiation.so
+
+<IfModule unixd_module>
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+# It is usually good practice to create a dedicated user and group for
+# running httpd, as with most system services.
+#
+User ${APACHE_RUN_USER}
+Group ${APACHE_RUN_GROUP}
+
+</IfModule>
+
+# 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition. These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed. This address appears on some server-generated pages, such
+# as error documents. e.g. admin@your-domain.com
+#
+# ServerAdmin you@example.com
+
+#
+# Optionally add a line containing the server version and virtual host
+# name to server-generated pages (internal error documents, FTP directory
+# listings, mod_status and mod_info output etc., but not CGI generated
+# documents or custom error documents).
+# Set to "EMail" to also include a mailto: link to the ServerAdmin.
+# Set to one of: On | Off | EMail
+#
+ServerSignature On
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+#
+#ServerName www.example.com:80
+
+#
+# Deny access to the entirety of your server's filesystem. You must
+# explicitly permit access to web content directories in other
+# <Directory> blocks below.
+#
+<Directory />
+ AllowOverride none
+ Require all denied
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/var/www/localhost/htdocs"
+<Directory "/var/www/localhost/htdocs">
+ #
+ # Possible values for the Options directive are "None", "All",
+ # or any combination of:
+ # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+ #
+ # Note that "MultiViews" must be named *explicitly* --- "Options All"
+ # doesn't give it to you.
+ #
+ # The Options directive is both complicated and important. Please see
+ # http://httpd.apache.org/docs/2.4/mod/core.html#options
+ # for more information.
+ #
+ Options Indexes FollowSymLinks ExecCGI
+
+ #
+ # AllowOverride controls what directives may be placed in .htaccess files.
+ # It can be "All", "None", or any combination of the keywords:
+ # AllowOverride FileInfo AuthConfig Limit
+ #
+ AllowOverride None
+
+ #
+ # Controls who can get stuff from this server.
+ #
+ Require all granted
+</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+<IfModule dir_module>
+ DirectoryIndex index.html
+</IfModule>
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being
+# viewed by Web clients.
+#
+<Files ".ht*">
+ Require all denied
+</Files>
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here. If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog ${APACHE_LOG_DIR}/error.log
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+<IfModule log_config_module>
+ #
+ # The following directives define some format nicknames for use with
+ # a CustomLog directive (see below).
+ #
+ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+ LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+ <IfModule logio_module>
+ # You need to enable mod_logio.c to use %I and %O
+ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+ </IfModule>
+
+ #
+ # The location and format of the access logfile (Common Logfile Format).
+ # If you do not define any access logfiles within a <VirtualHost>
+ # container, they will be logged here. Contrariwise, if you *do*
+ # define per-<VirtualHost> access logfiles, transactions will be
+ # logged therein and *not* in this file.
+ #
+ #CustomLog logs/access.log common
+
+ #
+ # If you prefer a logfile with access, agent, and referer information
+ # (Combined Logfile Format) you can use the following directive.
+ #
+ CustomLog logs/access.log combined
+</IfModule>
+
+<IfModule alias_module>
+ #
+ # Redirect: Allows you to tell clients about documents that used to
+ # exist in your server's namespace, but do not anymore. The client
+ # will make a new request for the document at its new location.
+ # Example:
+ # Redirect permanent /foo http://www.example.com/bar
+
+ #
+ # Alias: Maps web paths into filesystem paths and is used to
+ # access content that does not live under the DocumentRoot.
+ # Example:
+ # Alias /webpath /full/filesystem/path
+ #
+ # If you include a trailing / on /webpath then the server will
+ # require it to be present in the URL. You will also likely
+ # need to provide a <Directory> section to allow access to
+ # the filesystem path.
+
+ #
+ # ScriptAlias: This controls which directories contain server scripts.
+ # ScriptAliases are essentially the same as Aliases, except that
+ # documents in the target directory are treated as applications and
+ # run by the server when requested rather than as documents sent to the
+ # client. The same rules about trailing "/" apply to ScriptAlias
+ # directives as to Alias.
+ #
+ ScriptAlias /cgi-bin/ "/var/www/localhost/cgi-bin/"
+
+</IfModule>
+
+<IfModule cgid_module>
+ #
+ # ScriptSock: On threaded servers, designate the path to the UNIX
+ # socket used to communicate with the CGI daemon of mod_cgid.
+ #
+ Scriptsock cgisock
+</IfModule>
+
+#
+# "/var/www/localhost/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/var/cgi">
+ AllowOverride None
+ Options None
+ Require all granted
+</Directory>
+
+<IfModule headers_module>
+ #
+ # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied
+ # backend servers which have lingering "httpoxy" defects.
+ # 'Proxy' request header is undefined by the IETF, not listed by IANA
+ #
+ RequestHeader unset Proxy early
+</IfModule>
+
+<IfModule mime_module>
+ #
+ # TypesConfig points to the file containing the list of mappings from
+ # filename extension to MIME-type.
+ #
+ TypesConfig /etc/apache2/mime.types
+
+ #
+ # AddType allows you to add to or override the MIME configuration
+ # file specified in TypesConfig for specific file types.
+ #
+ #AddType application/x-gzip .tgz
+ #
+ # AddEncoding allows you to have certain browsers uncompress
+ # information on the fly. Note: Not all browsers support this.
+ #
+ #AddEncoding x-compress .Z
+ #AddEncoding x-gzip .gz .tgz
+ #
+ # If the AddEncoding directives above are commented-out, then you
+ # probably should define those extensions to indicate media types:
+ #
+ AddType application/x-compress .Z
+ AddType application/x-gzip .gz .tgz
+
+ #
+ # AddHandler allows you to map certain file extensions to "handlers":
+ # actions unrelated to filetype. These can be either built into the server
+ # or added with the Action directive (see below)
+ #
+ # To use CGI scripts outside of ScriptAliased directories:
+ # (You will also need to add "ExecCGI" to the "Options" directive.)
+ #
+ AddHandler cgi-script .cgi .sh
+
+ # For type maps (negotiated resources):
+ #AddHandler type-map var
+
+ #
+ # Filters allow you to process content before it is sent to the client.
+ #
+ # To parse .shtml files for server-side includes (SSI):
+ # (You will also need to add "Includes" to the "Options" directive.)
+ #
+ #AddType text/html .shtml
+ #AddOutputFilter INCLUDES .shtml
+</IfModule>
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# MaxRanges: Maximum number of Ranges in a request before
+# returning the entire resource, or one of the special
+# values 'default', 'none' or 'unlimited'.
+# Default setting is to accept 200 Ranges.
+#MaxRanges unlimited
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it,
+# memory-mapping or the sendfile syscall may be used to deliver
+# files. This usually improves server performance, but must
+# be turned off when serving from networked-mounted
+# filesystems or if support for these functions is otherwise
+# broken on your system.
+# Defaults: EnableMMAP On, EnableSendfile Off
+#
+#EnableMMAP off
+#EnableSendfile on
+
+# Load config files from the config directory "/etc/apache2/conf.d".
+#
+IncludeOptional /etc/apache2/conf.d/*.conf
diff --git a/container-images/apache-git-http-backend/tools/create_repo.sh b/container-images/apache-git-http-backend/tools/create_repo.sh
index bac1b21..0a90b86 100755
--- a/container-images/apache-git-http-backend/tools/create_repo.sh
+++ b/container-images/apache-git-http-backend/tools/create_repo.sh
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/ash
echo "Content-type: text/html"
REPO=${REQUEST_URI##/new/}
-if [[ "${REPO}" != *".git" ]]; then
+if test "$REPO" == "${REPO%.git}"; then
REPO="${REPO}.git"
fi
diff --git a/container-images/apache-git-http-backend/tools/start b/container-images/apache-git-http-backend/tools/start
index da4758b..5aad7bb 100755
--- a/container-images/apache-git-http-backend/tools/start
+++ b/container-images/apache-git-http-backend/tools/start
@@ -1,12 +1,12 @@
-#!/bin/bash
+#!/bin/ash
if [ "$DISABLE_HTTP" = "true" ] ;then
- rm /etc/apache2/sites-enabled/git-http-backend.conf
+ rm -f /etc/apache2/conf.d/git-http-backend.conf
fi
if [ "$DISABLE_HTTPS" = "true" ] ;then
- rm /etc/apache2/sites-enabled/git-https-backend.conf
+ rm -f /etc/apache2/conf.d/git-https-backend.conf
fi
-/etc/init.d/apache2 start \
+/usr/sbin/apachectl start \
&& tail -F -q -n +1 /var/log/apache2/*.log
diff --git a/container-images/base/Dockerfile b/container-images/base/Dockerfile
index c654e23..e760f4c 100644
--- a/container-images/base/Dockerfile
+++ b/container-images/base/Dockerfile
@@ -1,10 +1,7 @@
-FROM ubuntu:18.04
+FROM alpine:3.10.0
-RUN apt-get update && \
- apt-get -y install \
- git && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists/*
+RUN apk update && \
+ apk add --no-cache git
ARG GERRIT_UID=1000
-RUN useradd gerrit -u $GERRIT_UID -g users
+RUN adduser -D gerrit -u $GERRIT_UID -G users
diff --git a/container-images/base/README.md b/container-images/base/README.md
index 1539c41..59533cb 100644
--- a/container-images/base/README.md
+++ b/container-images/base/README.md
@@ -5,6 +5,6 @@
## Content
-* Ubuntu 18.04
+* Alpine Linux 3.10.0
* git
* create `gerrit`-user as a non-root user to run the applications
diff --git a/container-images/gerrit-base/Dockerfile b/container-images/gerrit-base/Dockerfile
index 48548b4..f2195a3 100644
--- a/container-images/gerrit-base/Dockerfile
+++ b/container-images/gerrit-base/Dockerfile
@@ -1,11 +1,10 @@
FROM base:latest
-RUN apt-get update && \
- apt-get -y install \
+RUN apk update && \
+ apk add --no-cache \
curl \
- openjdk-8-jdk && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists/*
+ openssh-keygen \
+ openjdk8
RUN mkdir -p /var/gerrit/bin && \
mkdir -p /var/gerrit/etc && \
@@ -13,7 +12,8 @@
# Download Gerrit release
ARG GERRIT_WAR_URL=https://gerrit-releases.storage.googleapis.com/gerrit-3.0.1.war
-RUN curl -k -o /var/war/gerrit.war ${GERRIT_WAR_URL} && ln -s /var/war/gerrit.war /var/gerrit/bin/gerrit.war
+RUN curl -k -o /var/war/gerrit.war ${GERRIT_WAR_URL} && \
+ ln -s /var/war/gerrit.war /var/gerrit/bin/gerrit.war
# Allow incoming traffic
EXPOSE 29418 8080
@@ -27,4 +27,4 @@
--no-auto-start \
-d /var/gerrit
-ENTRYPOINT ["/bin/bash", "/var/tools/start"]
+ENTRYPOINT ["ash", "/var/tools/start"]
diff --git a/container-images/gerrit-base/README.md b/container-images/gerrit-base/README.md
index ba53cdb..dfad4d4 100644
--- a/container-images/gerrit-base/README.md
+++ b/container-images/gerrit-base/README.md
@@ -6,15 +6,19 @@
## Content
* base image
-* gerrit.war
+* curl
+* openssh-keygen
* OpenJDK 8
+* gerrit.war
## Setup and configuration
+* install package dependencies
* create base folders for gerrit binary and gerrit configuration
* download gerrit.war from provided URL
* prepare filesystem permissions for gerrit user
* open ports for incoming traffic
+* initialize default Gerrit site
## Start
diff --git a/container-images/gerrit-init/Dockerfile b/container-images/gerrit-init/Dockerfile
index e3474cb..69860f9 100644
--- a/container-images/gerrit-init/Dockerfile
+++ b/container-images/gerrit-init/Dockerfile
@@ -8,11 +8,9 @@
COPY tools/* /var/tools/
WORKDIR /var/tools
-RUN apt-get update && \
- apt-get install -y \
- python3 && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists/*
+RUN apk update && \
+ apk add --no-cache \
+ python3
USER gerrit
diff --git a/container-images/gerrit-master/tools/start b/container-images/gerrit-master/tools/start
index e39013e..eddc1fd 100755
--- a/container-images/gerrit-master/tools/start
+++ b/container-images/gerrit-master/tools/start
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
symlink_config_to_site(){
mkdir -p /var/gerrit/etc
@@ -16,5 +16,9 @@
java -jar /var/gerrit/bin/gerrit.war reindex \
-d /var/gerrit
-/var/gerrit/bin/gerrit.sh start
-tail -F -n +1 /var/gerrit/logs/{error,httpd,sshd}_log
+JAVA_OPTIONS=$(git config --file /var/gerrit/etc/gerrit.config --get-all container.javaOptions)
+java ${JAVA_OPTIONS} -jar /var/gerrit/bin/gerrit.war daemon \
+ -d /var/gerrit \
+ --enable-httpd &
+
+tail -F -n +1 /var/gerrit/logs/error_log
diff --git a/container-images/gerrit-slave/tools/start b/container-images/gerrit-slave/tools/start
index 340816f..21e8268 100755
--- a/container-images/gerrit-slave/tools/start
+++ b/container-images/gerrit-slave/tools/start
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
symlink_config_to_site(){
mkdir -p /var/gerrit/etc
@@ -20,4 +20,4 @@
--enable-httpd \
--slave &
-tail -F -n +1 /var/gerrit/logs/{error,httpd,sshd}_log
+tail -F -n +1 /var/gerrit/logs/error_log
diff --git a/container-images/git-gc/tools/gc-all.sh b/container-images/git-gc/tools/gc-all.sh
index b27d297..dbe3ae9 100755
--- a/container-images/git-gc/tools/gc-all.sh
+++ b/container-images/git-gc/tools/gc-all.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
log() {
# Rotate the $LOG if current date is different from the last modification of $LOG
@@ -37,7 +37,7 @@
fi
}
-find $TOP -type d -name \*.git -print0 | sed 's,^./,,' | while IFS= read -r -d $'\0' d
+find $TOP -type d -name \*.git | sed 's,^./,,' | while IFS= read -r -d $'\n' d
do
OPTS=$(gc_options $d)
LOG_OPTS=$(log_opts $OPTS)
diff --git a/helm-charts/gerrit-master/templates/gerrit-master.stateful-set.yaml b/helm-charts/gerrit-master/templates/gerrit-master.stateful-set.yaml
index a307c3c..2f6d344 100644
--- a/helm-charts/gerrit-master/templates/gerrit-master.stateful-set.yaml
+++ b/helm-charts/gerrit-master/templates/gerrit-master.stateful-set.yaml
@@ -50,7 +50,7 @@
image: {{ template "registry" . }}{{ .Values.gerritMaster.images.gerritInit }}:{{ .Values.images.version }}
imagePullPolicy: {{ .Values.images.imagePullPolicy }}
command:
- - /bin/bash
+ - /bin/ash
- -ce
args:
- |
diff --git a/helm-charts/gerrit-master/values.yaml b/helm-charts/gerrit-master/values.yaml
index ad4042f..44bf9ad 100644
--- a/helm-charts/gerrit-master/values.yaml
+++ b/helm-charts/gerrit-master/values.yaml
@@ -163,7 +163,7 @@
directory = cache
[container]
user = gerrit # FIXED
- javaHome = /usr/lib/jvm/java-8-openjdk-amd64 # FIXED
+ javaHome = /usr/lib/jvm/java-1.8-openjdk # FIXED
javaOptions = -Djavax.net.ssl.trustStore=/var/gerrit/etc/keystore # FIXED
javaOptions = -Xms200m
# Has to be lower than 'gerritMaster.resources.limits.memory'. Also
diff --git a/helm-charts/gerrit-slave/README.md b/helm-charts/gerrit-slave/README.md
index 13d3479..8bc8791 100644
--- a/helm-charts/gerrit-slave/README.md
+++ b/helm-charts/gerrit-slave/README.md
@@ -69,7 +69,7 @@
sure that you have the correct access rights do so.):
```sh
-kubectl exec -it <gerrit-slave-pod> -c gerrit-init bash
+kubectl exec -it <gerrit-slave-pod> -c gerrit-init ash
gerrit@<gerrit-slave-pod>:/var/tools$ cd /var/gerrit/git
gerrit@<gerrit-slave-pod>:/var/gerrit/git$ git clone "http://gerrit-master.com/All-Projects" --mirror
Cloning into bare repository 'All-Projects.git'...
diff --git a/helm-charts/gerrit-slave/templates/gerrit-slave.deployment.yaml b/helm-charts/gerrit-slave/templates/gerrit-slave.deployment.yaml
index da33a26..73fd8e2 100644
--- a/helm-charts/gerrit-slave/templates/gerrit-slave.deployment.yaml
+++ b/helm-charts/gerrit-slave/templates/gerrit-slave.deployment.yaml
@@ -53,7 +53,7 @@
image: {{ template "registry" . }}{{ .Values.gerritSlave.images.gerritInit }}:{{ .Values.images.version }}
imagePullPolicy: {{ .Values.images.imagePullPolicy }}
command:
- - /bin/bash
+ - /bin/ash
- -ce
args:
- |
@@ -73,7 +73,7 @@
image: {{ template "registry" . }}{{ .Values.gerritSlave.images.gerritInit }}:{{ .Values.images.version }}
imagePullPolicy: {{ .Values.images.imagePullPolicy }}
command:
- - /bin/bash
+ - /bin/ash
- -ce
args:
- |
diff --git a/helm-charts/gerrit-slave/values.yaml b/helm-charts/gerrit-slave/values.yaml
index 8b4d028..8f55c82 100644
--- a/helm-charts/gerrit-slave/values.yaml
+++ b/helm-charts/gerrit-slave/values.yaml
@@ -226,7 +226,7 @@
[container]
user = gerrit # FIXED
slave = true # FIXED
- javaHome = /usr/lib/jvm/java-8-openjdk-amd64 # FIXED
+ javaHome = /usr/lib/jvm/java-1.8-openjdk # FIXED
javaOptions = -Djavax.net.ssl.trustStore=/var/gerrit/etc/keystore # FIXED
javaOptions = -Xms200m
# Has to be lower than 'gerritSlave.resources.limits.memory'. Also
diff --git a/tests/container-images/apache-git-http-backend/test_container_structure_apache_git_http_backend.py b/tests/container-images/apache-git-http-backend/test_container_structure_apache_git_http_backend.py
index 3539d96..241e42d 100755
--- a/tests/container-images/apache-git-http-backend/test_container_structure_apache_git_http_backend.py
+++ b/tests/container-images/apache-git-http-backend/test_container_structure_apache_git_http_backend.py
@@ -23,20 +23,20 @@
def test_apache_git_http_backend_contains_apache2(container_run):
- exit_code, _ = container_run.exec_run("which apache2")
+ exit_code, _ = container_run.exec_run("which httpd")
assert exit_code == 0
def test_apache_git_http_backend_http_site_configured(container_run):
exit_code, _ = container_run.exec_run(
- "test -f /etc/apache2/sites-enabled/git-http-backend.conf"
+ "test -f /etc/apache2/conf.d/git-http-backend.conf"
)
assert exit_code == 0
def test_apache_git_http_backend_https_site_configured(container_run):
exit_code, _ = container_run.exec_run(
- "test -f /etc/apache2/sites-enabled/git-https-backend.conf"
+ "test -f /etc/apache2/conf.d/git-https-backend.conf"
)
assert exit_code == 0
@@ -53,5 +53,5 @@
def test_apache_git_http_backend_has_entrypoint(apache_git_http_backend_image):
entrypoint = apache_git_http_backend_image.attrs["ContainerConfig"]["Entrypoint"]
- assert len(entrypoint) == 1
- assert entrypoint[0] == "/var/tools/start"
+ assert len(entrypoint) == 2
+ assert entrypoint[1] == "/var/tools/start"
diff --git a/tests/container-images/conftest.py b/tests/container-images/conftest.py
index 5ca6b67..88f4151 100644
--- a/tests/container-images/conftest.py
+++ b/tests/container-images/conftest.py
@@ -83,7 +83,7 @@
def get_container(docker_client, image):
return docker_client.containers.run(
image=image.id,
- entrypoint="/bin/bash",
+ entrypoint="/bin/ash",
command=["-c", "tail -f /dev/null"],
user="gerrit",
detach=True,
diff --git a/tests/container-images/gerrit-base/test_container_structure_gerrit_base.py b/tests/container-images/gerrit-base/test_container_structure_gerrit_base.py
index 06c1123..08a311c 100755
--- a/tests/container-images/gerrit-base/test_container_structure_gerrit_base.py
+++ b/tests/container-images/gerrit-base/test_container_structure_gerrit_base.py
@@ -41,11 +41,11 @@
def test_gerrit_base_java_path(container_run):
exit_code, output = container_run.exec_run(
- '/bin/bash -c "readlink -f $(which java)"'
+ '/bin/ash -c "readlink -f $(which java)"'
)
- assert exit_code == 0
output = output.strip().decode("utf-8")
- assert output == "/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java"
+ assert exit_code == 0
+ assert output == "/usr/lib/jvm/java-1.8-openjdk/jre/bin/java"
def test_gerrit_base_contains_gerrit_war(container_run):
diff --git a/tests/container-images/gerrit-init/test_container_integration_gerrit_init_h2.py b/tests/container-images/gerrit-init/test_container_integration_gerrit_init_h2.py
index 3e7a076..370ed49 100644
--- a/tests/container-images/gerrit-init/test_container_integration_gerrit_init_h2.py
+++ b/tests/container-images/gerrit-init/test_container_integration_gerrit_init_h2.py
@@ -50,7 +50,7 @@
tmp_site_dir = tmp_path_factory.mktemp("gerrit_site")
container_run = docker_client.containers.run(
image=gerrit_init_image.id,
- entrypoint="/bin/bash",
+ entrypoint="/bin/ash",
command=["-c", "tail -f /dev/null"],
user="gerrit",
volumes={tmp_site_dir: {"bind": "/var/gerrit", "mode": "rw"}},
@@ -93,7 +93,7 @@
)
assert exit_code == 0
cmd = (
- "/bin/bash -c '"
+ "/bin/ash -c '"
+ "test -f /var/gerrit/plugins/replication.jar && "
+ "test -f /var/gerrit/plugins/reviewnotes.jar'"
)
@@ -109,7 +109,7 @@
assert exit_code == 0
cmd = (
- "/bin/bash -c '"
+ "/bin/ash -c '"
+ "test -f /var/gerrit/plugins/replication.jar && "
+ "test -f /var/gerrit/plugins/reviewnotes.jar && "
+ "test -f /var/gerrit/plugins/hooks.jar'"
@@ -125,10 +125,10 @@
)
assert exit_code == 0
- cmd = "/bin/bash -c '" + "test -f /var/gerrit/plugins/download-commands.jar'"
+ cmd = "/bin/ash -c '" + "test -f /var/gerrit/plugins/download-commands.jar'"
exit_code, _ = container_run_endless.exec_run(cmd)
assert exit_code == 0
- cmd = "/bin/bash -c '" + "test -f /var/gerrit/plugins/reviewnotes.jar'"
+ cmd = "/bin/ash -c '" + "test -f /var/gerrit/plugins/reviewnotes.jar'"
exit_code, _ = container_run_endless.exec_run(cmd)
assert exit_code == 1
