diff --git a/test/images/httpd-new/BASEIMAGE b/test/images/httpd-new/BASEIMAGE index 8a9f42037b6..20a43189a5a 100644 --- a/test/images/httpd-new/BASEIMAGE +++ b/test/images/httpd-new/BASEIMAGE @@ -3,3 +3,8 @@ linux/arm=arm32v6/httpd:2.4.39-alpine linux/arm64=arm64v8/httpd:2.4.39-alpine linux/ppc64le=ppc64le/httpd:2.4.39-alpine linux/s390x=s390x/httpd:2.4.39-alpine +windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 +windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903 +windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909 +windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 diff --git a/test/images/httpd-new/Dockerfile_windows b/test/images/httpd-new/Dockerfile_windows new file mode 100644 index 00000000000..0a0c4d0b0ce --- /dev/null +++ b/test/images/httpd-new/Dockerfile_windows @@ -0,0 +1,46 @@ +# Copyright 2021 The Kubernetes Authors. +# +# Licensed 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. + +ARG BASEIMAGE +ARG REGISTRY + +# We're using a Linux image to unpack the archive, then we're copying it over to Windows. +FROM --platform=linux/amd64 alpine:3.6 as prep + +ADD https://home.apache.org/~steffenal/VC15/binaries/httpd-2.4.46-win64-VC15.zip /httpd.zip +ADD https://windows.php.net/downloads/releases/php-7.4.14-Win32-vc15-x64.zip /php.zip + +RUN unzip /httpd.zip &&\ + mv ReadMe.txt /Apache24/DistributionReadMe.txt &&\ + mkdir /php &&\ + unzip /php.zip -d /php/ + +FROM e2eteam/busybox-helper:1.29.0 as busybox-helper +FROM $BASEIMAGE + +# NOTE(claudiub): httpd requires vcruntime140.dll, which is already included in the +# busybox-helper image (it is also needed by dig). +COPY --from=busybox-helper /dig/vcruntime140.dll /Windows/System32/ +COPY --from=prep /Apache24 /usr/local/apache2 +COPY --from=prep /php /tools/php74 + +COPY httpd.conf /usr/local/apache2/conf/httpd.conf +COPY index.html /usr/local/apache2/htdocs/index.html + +# NOTE(claudiub): docker buildx sets the PATH env variable to a Linux-like PATH, which is not desirable. +ENV PATH="C:\bin;C:\curl;C:\Windows\System32;C:\Windows;C:\Program Files\PowerShell;C:\tools\php74\;C:\usr\local\apache2\bin\;" + +USER ContainerAdministrator +EXPOSE 80 +ENTRYPOINT ["C:/usr/local/apache2/bin/httpd.exe"] diff --git a/test/images/httpd-new/httpd.conf b/test/images/httpd-new/httpd.conf new file mode 100644 index 00000000000..e799726d023 --- /dev/null +++ b/test/images/httpd-new/httpd.conf @@ -0,0 +1,533 @@ +# +# This is the main Apache HTTP server configuration file. It contains the +# configuration directives that give the server its instructions. +# See for detailed information. +# In particular, see +# +# 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'. +# +# NOTE: Where filenames are specified, you must use forward slashes +# instead of backslashes (e.g., "c:/apache" instead of "c:\apache"). +# If a drive letter is omitted, the drive on which httpd.exe is located +# will be used by default. It is recommended that you always supply +# an explicit drive letter in absolute paths to avoid confusion. + +# +# 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. +# +Define SRVROOT "C:/usr/local/apache2/" +ServerRoot "${SRVROOT}" + +# +# 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:logs + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# 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 +AddHandler application/x-httpd-php .php +AddType application/x-httpd-php .php .html +PHPIniDir "c:/tools/php74" +# +# 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 php7_module "c:/tools/php74/php7apache2_4.dll" +# LoadModule foo_module modules/mod_foo.so +# +#LoadModule access_compat_module modules/mod_access_compat.so +LoadModule actions_module modules/mod_actions.so +LoadModule alias_module modules/mod_alias.so +LoadModule allowmethods_module modules/mod_allowmethods.so +LoadModule asis_module modules/mod_asis.so +LoadModule auth_basic_module modules/mod_auth_basic.so +#LoadModule auth_digest_module modules/mod_auth_digest.so +#LoadModule auth_form_module modules/mod_auth_form.so +#LoadModule authn_anon_module modules/mod_authn_anon.so +LoadModule authn_core_module modules/mod_authn_core.so +#LoadModule authn_dbd_module modules/mod_authn_dbd.so +#LoadModule authn_dbm_module modules/mod_authn_dbm.so +LoadModule authn_file_module modules/mod_authn_file.so +#LoadModule authn_socache_module modules/mod_authn_socache.so +#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so +#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so +LoadModule authz_core_module modules/mod_authz_core.so +#LoadModule authz_dbd_module modules/mod_authz_dbd.so +#LoadModule authz_dbm_module modules/mod_authz_dbm.so +LoadModule authz_groupfile_module modules/mod_authz_groupfile.so +LoadModule authz_host_module modules/mod_authz_host.so +#LoadModule authz_owner_module modules/mod_authz_owner.so +LoadModule authz_user_module modules/mod_authz_user.so +LoadModule autoindex_module modules/mod_autoindex.so +#LoadModule buffer_module modules/mod_buffer.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 cern_meta_module modules/mod_cern_meta.so +LoadModule cgi_module modules/mod_cgi.so +#LoadModule charset_lite_module modules/mod_charset_lite.so +#LoadModule data_module modules/mod_data.so +#LoadModule dav_module modules/mod_dav.so +#LoadModule dav_fs_module modules/mod_dav_fs.so +#LoadModule dav_lock_module modules/mod_dav_lock.so +#LoadModule dbd_module modules/mod_dbd.so +#LoadModule deflate_module modules/mod_deflate.so +LoadModule dir_module modules/mod_dir.so +#LoadModule dumpio_module modules/mod_dumpio.so +LoadModule env_module modules/mod_env.so +#LoadModule expires_module modules/mod_expires.so +#LoadModule ext_filter_module modules/mod_ext_filter.so +#LoadModule file_cache_module modules/mod_file_cache.so +#LoadModule filter_module modules/mod_filter.so +#LoadModule headers_module modules/mod_headers.so +#LoadModule heartbeat_module modules/mod_heartbeat.so +#LoadModule heartmonitor_module modules/mod_heartmonitor.so +#LoadModule http2_module modules/mod_http2.so +#LoadModule ident_module modules/mod_ident.so +#LoadModule imagemap_module modules/mod_imagemap.so +LoadModule include_module modules/mod_include.so +LoadModule info_module modules/mod_info.so +LoadModule isapi_module modules/mod_isapi.so +#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so +#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so +#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so +#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so +#LoadModule ldap_module modules/mod_ldap.so +#LoadModule logio_module modules/mod_logio.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 lua_module modules/mod_lua.so +#LoadModule macro_module modules/mod_macro.so +#LoadModule md_module modules/mod_md.so +LoadModule mime_module modules/mod_mime.so +#LoadModule mime_magic_module modules/mod_mime_magic.so +LoadModule negotiation_module modules/mod_negotiation.so +#LoadModule proxy_module modules/mod_proxy.so +#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so +#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so +#LoadModule proxy_connect_module modules/mod_proxy_connect.so +#LoadModule proxy_express_module modules/mod_proxy_express.so +#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so +#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so +#LoadModule proxy_html_module modules/mod_proxy_html.so +#LoadModule proxy_http_module modules/mod_proxy_http.so +#LoadModule proxy_http2_module modules/mod_proxy_http2.so +#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so +#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so +#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so +#LoadModule ratelimit_module modules/mod_ratelimit.so +#LoadModule reflector_module modules/mod_reflector.so +#LoadModule remoteip_module modules/mod_remoteip.so +#LoadModule request_module modules/mod_request.so +#LoadModule reqtimeout_module modules/mod_reqtimeout.so +#LoadModule rewrite_module modules/mod_rewrite.so +#LoadModule sed_module modules/mod_sed.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 setenvif_module modules/mod_setenvif.so +#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so +#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so +#LoadModule socache_dbm_module modules/mod_socache_dbm.so +#LoadModule socache_memcache_module modules/mod_socache_memcache.so +LoadModule socache_shmcb_module modules/mod_socache_shmcb.so +#LoadModule speling_module modules/mod_speling.so +LoadModule ssl_module modules/mod_ssl.so +LoadModule status_module modules/mod_status.so +#LoadModule substitute_module modules/mod_substitute.so +#LoadModule unique_id_module modules/mod_unique_id.so +#LoadModule userdir_module modules/mod_userdir.so +#LoadModule usertrack_module modules/mod_usertrack.so +#LoadModule version_module modules/mod_version.so +#LoadModule vhost_alias_module modules/mod_vhost_alias.so +#LoadModule watchdog_module modules/mod_watchdog.so +#LoadModule xml2enc_module modules/mod_xml2enc.so + + +# +# 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 daemon +Group daemon + + + +# '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 +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside 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 admin@example.com + +# +# 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 localhost:80 + +# +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. +# + + AllowOverride none + Require all denied + + +# +# 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 "${SRVROOT}/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 + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # Options FileInfo AuthConfig Limit + # + AllowOverride None + + # + # Controls who can get stuff from this server. + # + Require all granted + + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# + + DirectoryIndex index.html + + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog "logs/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 + + + # + # 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 + + + # 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 + + + # + # The location and format of the access logfile (Common Logfile Format). + # If you do not define any access logfiles within a + # container, they will be logged here. Contrariwise, if you *do* + # define per- 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 + + + + # + # 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 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/ "${SRVROOT}/cgi-bin/" + + + + + # + # ScriptSock: On threaded servers, designate the path to the UNIX + # socket used to communicate with the CGI daemon of mod_cgid. + # + #Scriptsock logs/cgisock + + +# +# "${SRVROOT}/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Require all granted + + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig conf/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 .pl + + # 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 + + +# +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +# +#MIMEMagicFile conf/magic + +# +# 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 + +#AcceptFilter http none +#AcceptFilter https none + +# Supplemental configuration +# +# The configuration files in the conf/extra/ directory can be +# included to add extra features or to modify the default configuration of +# the server, or you may simply copy their contents here and change as +# necessary. + +# Server-pool management (MPM specific) +#Include conf/extra/httpd-mpm.conf + +# Multi-language error messages +#Include conf/extra/httpd-multilang-errordoc.conf + +# Fancy directory listings +Include conf/extra/httpd-autoindex.conf + +# Language settings +#Include conf/extra/httpd-languages.conf + +# User home directories +#Include conf/extra/httpd-userdir.conf + +# Real-time info on requests and configuration +Include conf/extra/httpd-info.conf + +# Virtual hosts +# Include conf/extra/httpd-vhosts.conf + +# Local access to the Apache HTTP Server Manual +#Include conf/extra/httpd-manual.conf + +# Distributed authoring and versioning (WebDAV) +#Include conf/extra/httpd-dav.conf + +# Various default settings +#Include conf/extra/httpd-default.conf + +# Configure mod_proxy_html to understand HTML4/XHTML1 + +Include conf/extra/httpd-proxy-html.conf + + +# Secure (SSL/TLS) connections +# Note: The following must must be present to support +# starting without SSL on platforms with no /dev/random equivalent +# but a statically compiled-in mod_ssl. +# + +#Include conf/extra/httpd-ssl.conf +#Include conf/extra/httpd-ahssl.conf +SSLRandomSeed startup builtin +SSLRandomSeed connect builtin + + + ProtocolsHonorOrder On + Protocols h2 h2c http/1.1 + diff --git a/test/images/httpd-new/index.html b/test/images/httpd-new/index.html new file mode 100644 index 00000000000..f5f1c377b64 --- /dev/null +++ b/test/images/httpd-new/index.html @@ -0,0 +1 @@ +

It works!

diff --git a/test/images/httpd/BASEIMAGE b/test/images/httpd/BASEIMAGE index 671f4b0fe5e..4611aa47a05 100644 --- a/test/images/httpd/BASEIMAGE +++ b/test/images/httpd/BASEIMAGE @@ -3,3 +3,8 @@ linux/arm=arm32v6/httpd:2.4.38-alpine linux/arm64=arm64v8/httpd:2.4.38-alpine linux/ppc64le=ppc64le/httpd:2.4.38-alpine linux/s390x=s390x/httpd:2.4.38-alpine +windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 +windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903 +windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909 +windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 diff --git a/test/images/httpd/Dockerfile_windows b/test/images/httpd/Dockerfile_windows new file mode 100644 index 00000000000..a8fc8d84448 --- /dev/null +++ b/test/images/httpd/Dockerfile_windows @@ -0,0 +1,46 @@ +# Copyright 2021 The Kubernetes Authors. +# +# Licensed 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. + +ARG BASEIMAGE +ARG REGISTRY + +# We're using a Linux image to unpack the archive, then we're copying it over to Windows. +FROM --platform=linux/amd64 alpine:3.6 as prep + +ADD https://home.apache.org/~steffenal/VC14/binaries/httpd-2.4.41-win64-VC14.zip /httpd.zip +ADD https://windows.php.net/downloads/releases/php-7.4.14-Win32-vc15-x64.zip /php.zip + +RUN unzip /httpd.zip &&\ + mv ReadMe.txt /Apache24/DistributionReadMe.txt &&\ + mkdir /php &&\ + unzip /php.zip -d /php/ + +FROM e2eteam/busybox-helper:1.29.0 as busybox-helper +FROM $BASEIMAGE + +# NOTE(claudiub): httpd requires vcruntime140.dll, which is already included in the +# busybox-helper image (it is also needed by dig). +COPY --from=busybox-helper /dig/vcruntime140.dll /Windows/System32/ +COPY --from=prep /Apache24 /usr/local/apache2 +COPY --from=prep /php /tools/php74 + +COPY httpd.conf /usr/local/apache2/conf/httpd.conf +COPY index.html /usr/local/apache2/htdocs/index.html + +# NOTE(claudiub): docker buildx sets the PATH env variable to a Linux-like PATH, which is not desirable. +ENV PATH="C:\bin;C:\curl;C:\Windows\System32;C:\Windows;C:\Program Files\PowerShell;C:\tools\php74\;C:\usr\local\apache2\bin\;" + +USER ContainerAdministrator +EXPOSE 80 +ENTRYPOINT ["C:/usr/local/apache2/bin/httpd.exe"] diff --git a/test/images/httpd/httpd.conf b/test/images/httpd/httpd.conf new file mode 100644 index 00000000000..e799726d023 --- /dev/null +++ b/test/images/httpd/httpd.conf @@ -0,0 +1,533 @@ +# +# This is the main Apache HTTP server configuration file. It contains the +# configuration directives that give the server its instructions. +# See for detailed information. +# In particular, see +# +# 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'. +# +# NOTE: Where filenames are specified, you must use forward slashes +# instead of backslashes (e.g., "c:/apache" instead of "c:\apache"). +# If a drive letter is omitted, the drive on which httpd.exe is located +# will be used by default. It is recommended that you always supply +# an explicit drive letter in absolute paths to avoid confusion. + +# +# 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. +# +Define SRVROOT "C:/usr/local/apache2/" +ServerRoot "${SRVROOT}" + +# +# 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:logs + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# 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 +AddHandler application/x-httpd-php .php +AddType application/x-httpd-php .php .html +PHPIniDir "c:/tools/php74" +# +# 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 php7_module "c:/tools/php74/php7apache2_4.dll" +# LoadModule foo_module modules/mod_foo.so +# +#LoadModule access_compat_module modules/mod_access_compat.so +LoadModule actions_module modules/mod_actions.so +LoadModule alias_module modules/mod_alias.so +LoadModule allowmethods_module modules/mod_allowmethods.so +LoadModule asis_module modules/mod_asis.so +LoadModule auth_basic_module modules/mod_auth_basic.so +#LoadModule auth_digest_module modules/mod_auth_digest.so +#LoadModule auth_form_module modules/mod_auth_form.so +#LoadModule authn_anon_module modules/mod_authn_anon.so +LoadModule authn_core_module modules/mod_authn_core.so +#LoadModule authn_dbd_module modules/mod_authn_dbd.so +#LoadModule authn_dbm_module modules/mod_authn_dbm.so +LoadModule authn_file_module modules/mod_authn_file.so +#LoadModule authn_socache_module modules/mod_authn_socache.so +#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so +#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so +LoadModule authz_core_module modules/mod_authz_core.so +#LoadModule authz_dbd_module modules/mod_authz_dbd.so +#LoadModule authz_dbm_module modules/mod_authz_dbm.so +LoadModule authz_groupfile_module modules/mod_authz_groupfile.so +LoadModule authz_host_module modules/mod_authz_host.so +#LoadModule authz_owner_module modules/mod_authz_owner.so +LoadModule authz_user_module modules/mod_authz_user.so +LoadModule autoindex_module modules/mod_autoindex.so +#LoadModule buffer_module modules/mod_buffer.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 cern_meta_module modules/mod_cern_meta.so +LoadModule cgi_module modules/mod_cgi.so +#LoadModule charset_lite_module modules/mod_charset_lite.so +#LoadModule data_module modules/mod_data.so +#LoadModule dav_module modules/mod_dav.so +#LoadModule dav_fs_module modules/mod_dav_fs.so +#LoadModule dav_lock_module modules/mod_dav_lock.so +#LoadModule dbd_module modules/mod_dbd.so +#LoadModule deflate_module modules/mod_deflate.so +LoadModule dir_module modules/mod_dir.so +#LoadModule dumpio_module modules/mod_dumpio.so +LoadModule env_module modules/mod_env.so +#LoadModule expires_module modules/mod_expires.so +#LoadModule ext_filter_module modules/mod_ext_filter.so +#LoadModule file_cache_module modules/mod_file_cache.so +#LoadModule filter_module modules/mod_filter.so +#LoadModule headers_module modules/mod_headers.so +#LoadModule heartbeat_module modules/mod_heartbeat.so +#LoadModule heartmonitor_module modules/mod_heartmonitor.so +#LoadModule http2_module modules/mod_http2.so +#LoadModule ident_module modules/mod_ident.so +#LoadModule imagemap_module modules/mod_imagemap.so +LoadModule include_module modules/mod_include.so +LoadModule info_module modules/mod_info.so +LoadModule isapi_module modules/mod_isapi.so +#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so +#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so +#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so +#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so +#LoadModule ldap_module modules/mod_ldap.so +#LoadModule logio_module modules/mod_logio.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 lua_module modules/mod_lua.so +#LoadModule macro_module modules/mod_macro.so +#LoadModule md_module modules/mod_md.so +LoadModule mime_module modules/mod_mime.so +#LoadModule mime_magic_module modules/mod_mime_magic.so +LoadModule negotiation_module modules/mod_negotiation.so +#LoadModule proxy_module modules/mod_proxy.so +#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so +#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so +#LoadModule proxy_connect_module modules/mod_proxy_connect.so +#LoadModule proxy_express_module modules/mod_proxy_express.so +#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so +#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so +#LoadModule proxy_html_module modules/mod_proxy_html.so +#LoadModule proxy_http_module modules/mod_proxy_http.so +#LoadModule proxy_http2_module modules/mod_proxy_http2.so +#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so +#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so +#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so +#LoadModule ratelimit_module modules/mod_ratelimit.so +#LoadModule reflector_module modules/mod_reflector.so +#LoadModule remoteip_module modules/mod_remoteip.so +#LoadModule request_module modules/mod_request.so +#LoadModule reqtimeout_module modules/mod_reqtimeout.so +#LoadModule rewrite_module modules/mod_rewrite.so +#LoadModule sed_module modules/mod_sed.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 setenvif_module modules/mod_setenvif.so +#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so +#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so +#LoadModule socache_dbm_module modules/mod_socache_dbm.so +#LoadModule socache_memcache_module modules/mod_socache_memcache.so +LoadModule socache_shmcb_module modules/mod_socache_shmcb.so +#LoadModule speling_module modules/mod_speling.so +LoadModule ssl_module modules/mod_ssl.so +LoadModule status_module modules/mod_status.so +#LoadModule substitute_module modules/mod_substitute.so +#LoadModule unique_id_module modules/mod_unique_id.so +#LoadModule userdir_module modules/mod_userdir.so +#LoadModule usertrack_module modules/mod_usertrack.so +#LoadModule version_module modules/mod_version.so +#LoadModule vhost_alias_module modules/mod_vhost_alias.so +#LoadModule watchdog_module modules/mod_watchdog.so +#LoadModule xml2enc_module modules/mod_xml2enc.so + + +# +# 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 daemon +Group daemon + + + +# '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 +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside 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 admin@example.com + +# +# 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 localhost:80 + +# +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. +# + + AllowOverride none + Require all denied + + +# +# 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 "${SRVROOT}/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 + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # Options FileInfo AuthConfig Limit + # + AllowOverride None + + # + # Controls who can get stuff from this server. + # + Require all granted + + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# + + DirectoryIndex index.html + + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog "logs/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 + + + # + # 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 + + + # 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 + + + # + # The location and format of the access logfile (Common Logfile Format). + # If you do not define any access logfiles within a + # container, they will be logged here. Contrariwise, if you *do* + # define per- 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 + + + + # + # 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 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/ "${SRVROOT}/cgi-bin/" + + + + + # + # ScriptSock: On threaded servers, designate the path to the UNIX + # socket used to communicate with the CGI daemon of mod_cgid. + # + #Scriptsock logs/cgisock + + +# +# "${SRVROOT}/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Require all granted + + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig conf/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 .pl + + # 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 + + +# +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +# +#MIMEMagicFile conf/magic + +# +# 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 + +#AcceptFilter http none +#AcceptFilter https none + +# Supplemental configuration +# +# The configuration files in the conf/extra/ directory can be +# included to add extra features or to modify the default configuration of +# the server, or you may simply copy their contents here and change as +# necessary. + +# Server-pool management (MPM specific) +#Include conf/extra/httpd-mpm.conf + +# Multi-language error messages +#Include conf/extra/httpd-multilang-errordoc.conf + +# Fancy directory listings +Include conf/extra/httpd-autoindex.conf + +# Language settings +#Include conf/extra/httpd-languages.conf + +# User home directories +#Include conf/extra/httpd-userdir.conf + +# Real-time info on requests and configuration +Include conf/extra/httpd-info.conf + +# Virtual hosts +# Include conf/extra/httpd-vhosts.conf + +# Local access to the Apache HTTP Server Manual +#Include conf/extra/httpd-manual.conf + +# Distributed authoring and versioning (WebDAV) +#Include conf/extra/httpd-dav.conf + +# Various default settings +#Include conf/extra/httpd-default.conf + +# Configure mod_proxy_html to understand HTML4/XHTML1 + +Include conf/extra/httpd-proxy-html.conf + + +# Secure (SSL/TLS) connections +# Note: The following must must be present to support +# starting without SSL on platforms with no /dev/random equivalent +# but a statically compiled-in mod_ssl. +# + +#Include conf/extra/httpd-ssl.conf +#Include conf/extra/httpd-ahssl.conf +SSLRandomSeed startup builtin +SSLRandomSeed connect builtin + + + ProtocolsHonorOrder On + Protocols h2 h2c http/1.1 + diff --git a/test/images/httpd/index.html b/test/images/httpd/index.html new file mode 100644 index 00000000000..f5f1c377b64 --- /dev/null +++ b/test/images/httpd/index.html @@ -0,0 +1 @@ +

It works!

diff --git a/test/images/image-util.sh b/test/images/image-util.sh index d0b363092fd..44bc82b9c09 100755 --- a/test/images/image-util.sh +++ b/test/images/image-util.sh @@ -109,6 +109,15 @@ build() { image="${alias_name}" fi + # image tag + TAG=$(<"${img_folder}/VERSION") + + alias_name="$(cat "${img_folder}/ALIAS" 2>/dev/null || true)" + if [[ -n "${alias_name}" ]]; then + echo "Found an alias for '${image}'. Building / tagging image as '${alias_name}.'" + image="${alias_name}" + fi + kube::util::ensure-gnu-sed for os_arch in ${os_archs}; do @@ -205,6 +214,13 @@ push() { image="${alias_name}" fi + pushd "${image}" + alias_name="$(cat ALIAS 2>/dev/null || true)" + if [[ -n "${alias_name}" ]]; then + echo "Found an alias for '${image}'. Pushing image as '${alias_name}.'" + image="${alias_name}" + fi + kube::util::ensure-gnu-sed # reset manifest list; needed in case multiple images are being built / pushed. diff --git a/test/images/nginx-new/BASEIMAGE b/test/images/nginx-new/BASEIMAGE index 269c92ac3ad..3bb6ecf67ed 100644 --- a/test/images/nginx-new/BASEIMAGE +++ b/test/images/nginx-new/BASEIMAGE @@ -3,3 +3,8 @@ linux/arm=arm32v6/nginx:1.15-alpine linux/arm64=arm64v8/nginx:1.15-alpine linux/ppc64le=ppc64le/nginx:1.15-alpine linux/s390x=s390x/nginx:1.15-alpine +windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 +windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903 +windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909 +windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 diff --git a/test/images/nginx-new/Dockerfile_windows b/test/images/nginx-new/Dockerfile_windows new file mode 100644 index 00000000000..e0f5468cfe6 --- /dev/null +++ b/test/images/nginx-new/Dockerfile_windows @@ -0,0 +1,27 @@ +# Copyright 2021 The Kubernetes Authors. +# +# Licensed 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. + +ARG BASEIMAGE +ARG REGISTRY +ARG OS_VERSION + +FROM claudiubelu/nginx:1.19.2 as nginx-source +FROM --platform=linux/amd64 $REGISTRY/windows-servercore-cache:1.0-linux-amd64-$OS_VERSION as servercore-helper +FROM $BASEIMAGE + +COPY --from=nginx-source /nginx /usr/share/nginx + +USER ContainerAdministrator +EXPOSE 80 +ENTRYPOINT ["/usr/share/nginx/nginx.exe"] diff --git a/test/images/nginx/BASEIMAGE b/test/images/nginx/BASEIMAGE index c423c2d4a4b..b9aae45ad43 100644 --- a/test/images/nginx/BASEIMAGE +++ b/test/images/nginx/BASEIMAGE @@ -3,3 +3,8 @@ linux/arm=arm32v6/nginx:1.14-alpine linux/arm64=arm64v8/nginx:1.14-alpine linux/ppc64le=ppc64le/nginx:1.14-alpine linux/s390x=s390x/nginx:1.14-alpine +windows/amd64/1809=REGISTRY/busybox:1.29-windows-amd64-1809 +windows/amd64/1903=REGISTRY/busybox:1.29-windows-amd64-1903 +windows/amd64/1909=REGISTRY/busybox:1.29-windows-amd64-1909 +windows/amd64/2004=REGISTRY/busybox:1.29-windows-amd64-2004 +windows/amd64/20H2=REGISTRY/busybox:1.29-windows-amd64-20H2 diff --git a/test/images/nginx/Dockerfile_windows b/test/images/nginx/Dockerfile_windows new file mode 100644 index 00000000000..0111eadb1bd --- /dev/null +++ b/test/images/nginx/Dockerfile_windows @@ -0,0 +1,27 @@ +# Copyright 2021 The Kubernetes Authors. +# +# Licensed 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. + +ARG BASEIMAGE +ARG REGISTRY +ARG OS_VERSION + +FROM claudiubelu/nginx:1.18.0 as nginx-source +FROM --platform=linux/amd64 $REGISTRY/windows-servercore-cache:1.0-linux-amd64-$OS_VERSION as servercore-helper +FROM $BASEIMAGE + +COPY --from=nginx-source /nginx /usr/share/nginx + +USER ContainerAdministrator +EXPOSE 80 +ENTRYPOINT ["/usr/share/nginx/nginx.exe"]