Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test images: Adds Windows Container images support (part 3) #77269

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions test/images/httpd-new/BASEIMAGE
Expand Up @@ -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
46 changes: 46 additions & 0 deletions 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"]