Create runtime and build images. (#84)

* Create runtime and build images for 2.0

Author: aslicerh

2.0/Dockerfile.rhel7 renamed to 2.0/build/Dockerfile.rhel7

@@ -1,14 +1,9 @@
-FROM rhel7
+FROM dotnet/dotnet-20-rhel7-runtime
 # This image provides a .NET Core 2.0 environment you can use to run your .NET
 # applications.
 
-EXPOSE 8080
-
-ENV DOTNET_CORE_VERSION=2.0
 # Default to UTF-8 file.encoding
-ENV LANG=C.UTF-8 \
-    HOME=/opt/app-root \
-    PATH=/opt/app-root/src/.local/bin:/opt/app-root/src/bin:/opt/app-root/bin:/opt/app-root/node_modules/.bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+ENV PATH=/opt/app-root/src/.local/bin:/opt/app-root/src/bin:/opt/app-root/node_modules/.bin:${PATH} \
     STI_SCRIPTS_PATH=/usr/libexec/s2i \
     DOTNET_PUBLISH_PATH=/opt/app-root/publish \
     DOTNET_RUN_SCRIPT=/opt/app-root/publish/s2i_run
@@ -43,7 +38,7 @@ RUN yum install --disablerepo=\* --enablerepo=rhel-7-server-rpms -y yum-utils &&
     yum-config-manager --enable rhel-7-server-dotnet-rpms && \
     yum-config-manager --enable rhel-7-server-rpms && \
     yum-config-manager --enable rhel-7-server-ose-3.2-rpms && \
-    yum install -y --setopt=tsflags=nodocs nss_wrapper tar rh-nodejs6-npm && \
+    yum install -y --setopt=tsflags=nodocs rh-nodejs6-npm && \
     yum clean all && \
     mkdir -p /opt/app-root/{src,publish,warmup} && \
     useradd -u 1001 -r -g 0 -d /opt/app-root/src -s /sbin/nologin \
@@ -52,20 +47,13 @@ RUN yum install --disablerepo=\* --enablerepo=rhel-7-server-rpms -y yum-utils &&
 
 # TODO: remove upstream sdk
 # install upstream 2.0 sdk
-RUN yum install -y libunwind libicu && \
-    curl https://download.microsoft.com/download/0/6/5/0656B047-5F2F-4281-A851-F30776F8616D/dotnet-dev-linux-x64.2.0.0-preview1-005977.tar.gz -o /tmp/dotnet-sdk.tar.gz && \
-    mkdir -p /opt/dotnet && \
-    tar xf /tmp/dotnet-sdk.tar.gz -C /opt/dotnet && \
-    ln -s /opt/dotnet/dotnet /usr/bin/dotnet
+RUN curl https://download.microsoft.com/download/0/6/5/0656B047-5F2F-4281-A851-F30776F8616D/dotnet-dev-linux-x64.2.0.0-preview1-005977.tar.gz -o /tmp/dotnet-sdk.tar.gz && \
+	tar xf /tmp/dotnet-sdk.tar.gz -C /opt/dotnet "./sdk" && \
+	rm /tmp/dotnet-sdk.tar.gz
 
 # Switch to default app-user for cache population
 USER 1001
 
-# Don't download/extract docs for nuget packages
-ENV NUGET_XMLDOC_MODE=skip
-# Don't do initially populate of package cache
-ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-
 # TODO: scl enable rh-dotnet20 --
 # TODO: replace '.0-preview1-final' from AspNetPackageVersion with '.*'
 # Create NuGet package cache
@@ -102,10 +90,6 @@ WORKDIR /opt/app-root/src
 # Run container by default as user with id 1001 (default)
 USER 1001
 
-# By default, ASP.NET Core runs on port 5000. We configure it to match
-# the container port.
-ENV ASPNETCORE_URLS=http://*:8080
-
 ENTRYPOINT ["container-entrypoint"]
 
 # Set the default CMD to print the usage of the language image.

2.0/README.md renamed to 2.0/build/README.md

@@ -29,7 +29,11 @@ declare -a CLI_APPS=(
   dotnet-configuration-debug
   dotnet-configuration-release
 )
-declare -a WEB_APPS=(asp-net-hello-world asp-net-hello-world-envvar asp-net-hello-world-envvar2)
+declare -a WEB_APPS=(
+  asp-net-hello-world
+  asp-net-hello-world-envvar
+  asp-net-hello-world-envvar2
+)
 
 test_dir="$(readlink -zf $(dirname "${BASH_SOURCE[0]}"))"
 image_dir=$(readlink -zf ${test_dir}/..)
@@ -47,6 +51,7 @@ image_exists() {
 }
 
 container_exists() {
+  local cid_file="$1"
   image_exists $(cat $cid_file)
 }
 
@@ -80,18 +85,23 @@ prepare() {
 }
 
 run_test_application() {
-  docker run --user=100001 ${CONTAINER_ARGS} -d --cidfile=${cid_file} -p ${test_port}:${test_port} ${IMAGE_NAME}-testapp
+  local image="$1"
+  local cid_file="$2"
+  docker run --user=100001 ${CONTAINER_ARGS} -d --cidfile=${cid_file} -p ${test_port}:${test_port} ${image}
 }
 
 run_cli_test_application() {
-  docker run --user=100001 ${CONTAINER_ARGS} -i --rm ${IMAGE_NAME}-testapp
+  local image=$1
+  docker run --user=100001 ${CONTAINER_ARGS} -i --rm ${image}
 }
 
-cleanup_app() {
+cleanup_container() {
+  local cid_file="$1"
   info "Cleaning up app container ..."
   if [ -f $cid_file ]; then
-    if container_exists; then
+    if container_exists "${cid_file}"; then
       docker stop $(cat $cid_file)
+      docker rm  $(cat $cid_file)
     fi
   fi
 }
@@ -118,7 +128,7 @@ check_command_exists_at()
   local command=$1
   local at=$2
   info "Testing if ${command} is at ${at}"
-  local actual=$(docker run ${IMAGE_NAME}-testapp bash -c "command -v ${command}")
+  local actual=$(docker run --rm ${IMAGE_NAME}-testapp bash -c "command -v ${command}")
   if [[ "${at}_" != "${actual}_" ]]; then
     info "TEST FAILED (${command} is at ${actual}, expected ${at})"
     cleanup
@@ -148,7 +158,7 @@ test_s2i_usage() {
 test_docker_run_usage() {
   local expected="$1"
   info "Testing 'docker run' usage (${expected}) ..."
-  docker run ${IMAGE_NAME} 2>&1 | grep "${expected}" 2>&1 >/dev/null
+  docker run --rm ${IMAGE_NAME} 2>&1 | grep "${expected}" 2>&1 >/dev/null
 }
 
 test_pid_1() {
@@ -159,7 +169,7 @@ test_pid_1() {
   out="$(docker exec $(cat ${cid_file}) /bin/bash -c 'ps --no-headers -o args 1' 2>&1)"
   if ! echo "${out}" | grep "dotnet" | grep -q '\.dll' ; then
     echo "'dotnet <assembly>' not process with PID 1. PID 1 process was: '${out}'"
-    cleanup_app
+    cleanup_container "${cid_file}"
     return 1
   fi
 }
@@ -168,9 +178,10 @@ test_scl_usage() {
   local run_cmd="$1"
   local expected="$2"
   local cid_file="$3"
+  local image="$4"
 
-  info "Testing the image SCL enable"
-  out=$(docker run --rm ${IMAGE_NAME} /bin/bash -c "${run_cmd}" 2>&1)
+  info "Testing the image SCL enable for '${run_cmd}'"
+  out=$(docker run --rm ${image} /bin/bash -c "${run_cmd}" 2>&1)
   if ! echo "${out}" | grep -q "${expected}"; then
     echo "ERROR[/bin/bash -c "${run_cmd}"] Expected '${expected}', got '${out}'"
     return 1
@@ -233,52 +244,88 @@ test_http() {
   return $result
 }
 
-test_web_application() {
-  local cid_file=$(mktemp -u --suffix=.cid)
-  # Verify that the HTTP connection can be established to test application container
-  run_test_application &
+test_web_app_http() {
+  test_http "/" "Hello world"
+  check_result $?
+  test_http "/TextFile.txt" "A text file."
+  check_result $?
+}
 
-  # Wait for the container to write it's CID file
-  wait_for_cid
+test_web_app_scl() {
+  local image="$1"
+  local cid_file="$2"
 
-  test_scl_usage "dotnet --version" "${dotnet_version}" "${cid_file}"
+  test_scl_usage "dotnet --version" "${dotnet_version}" "${cid_file}" "${image}"
   check_result $?
 
   # Verify $HOME != $CWD. See https://github.com/redhat-developer/s2i-dotnetcore/issues/28
-  test_scl_usage "pwd" "/opt/app-root/src" "${cid_file}"
+  test_scl_usage "pwd" "/opt/app-root/src" "${cid_file}" "${image}"
   check_result $?
-  test_scl_usage "echo \$HOME" "/opt/app-root" "${cid_file}"
+  test_scl_usage "echo \$HOME" "/opt/app-root" "${cid_file}" "${image}"
   check_result $?
 
   # Verify npm is enabled in the container
-  test_scl_usage "npm --version" "2.15.1" "${cid_file}"
+  test_scl_usage "npm --version" "2.15.1" "${cid_file}" "${image}"
+}
 
-  test_http "/" "Hello world"
-  check_result $?
-  test_http "/TextFile.txt" "A text file."
-  check_result $?
+init_web_app() {
+  local image="$1"
+  local cid_file="$2"
+
+  # Verify that the HTTP connection can be established to test application container
+  run_test_application "${image}" "${cid_file}" &
+
+  # Wait for the container to write it's CID file
+  wait_for_cid
 
   test_pid_1 "${cid_file}"
   check_result $?
+}
+
+test_web_application() {
+  local app="$1"
+  info "Starting web application tests for '${app}'"
+  prepare ${app}
+  run_s2i_build ${app}
+  check_result $?
+
+  image="${IMAGE_NAME}-testapp"
 
-  cleanup_app
+  ##
+  # test the image
+  ##
+  info "Starting build image tests"
+  local cid_file=$(mktemp -u --suffix=.cid)
+  init_web_app "${image}" "${cid_file}"
+  # test application with default user
+  test_web_app_scl "${image}" "${cid_file}"
+  test_web_app_http
+
+  # test application with random user
+  CONTAINER_ARGS="-u 12345" test_web_app_scl "${image}" "${cid_file}"
+  CONTAINER_ARGS="-u 12345" test_web_app_http
+  cleanup_container "${cid_file}"
+
+  info "All web application tests for '${app}' finished successfully."
+  cleanup ${app}
 }
 
 test_openshift_sample_app() {
+  local image="$1"
   local cid_file=$(mktemp -u --suffix=.cid)
   # Verify that the HTTP connection can be established to test application container
-  run_test_application &
+  run_test_application "${image}" "${cid_file}" &
 
   # Wait for the container to write it's CID file
   wait_for_cid
 
-  test_scl_usage "dotnet --version" "${dotnet_version}" "${cid_file}"
+  test_scl_usage "dotnet --version" "${dotnet_version}" "${cid_file}" "${image}"
   check_result $?
 
   test_http "/" "Sample pages using ASP.NET Core MVC" "grep \"ASP.NET Core MVC\" | sed -e 's#<li>##g' -e 's#</li>##g' -e 's#^ \\+##g'"
   check_result $?
 
-  cleanup_app
+  cleanup_container "${cid_file}"
 }
 
 echo_details() {
@@ -393,22 +440,21 @@ success_cli() {
 
 test_cli_app() {
   local app="$1"
-  info "Testing CLI app: ${app} ..."
+  info "Testing CLI app against build image: ${app} ..."
   prepare ${app}
   run_s2i_build ${app}
   check_result $?
 
   local expected="$( get_expected_cli ${app} )"
-  local actual_pre="$( run_cli_test_application )"
+  local actual_pre="$( run_cli_test_application ${IMAGE_NAME}-testapp)"
   local actual="$( filter_cli "${app}" "${actual_pre}" )"
   if ! success_cli "${app}" "${actual}" "${expected}"; then
     info "Test CLI app: ${app} FAILED."
     echo_details "${expected}" "${actual}"
     cleanup ${app}
     exit 1
-  else
-    info "Test CLI app: ${app} PASSED."
   fi
+  info "Test CLI app (build image): ${app} PASSED."
   cleanup ${app}
 }
 
@@ -419,7 +465,7 @@ test_new_web_app() {
   check_result $?
 
   local cid_file=$(mktemp -u --suffix=.cid)
-  run_test_application &
+  run_test_application "${IMAGE_NAME}-testapp" "${cid_file}" &
   wait_for_cid
 
   # installed via DOTNET_NPM_TOOLS
@@ -429,7 +475,7 @@ test_new_web_app() {
   test_http "/js/site.min.js"
   check_result $?
 
-  cleanup_app
+  cleanup_container "${cid_file}"
   info "All tests for the ${app} finished successfully."
   cleanup ${app}
 }
@@ -456,10 +502,10 @@ if [ ${OPENSHIFT_ONLY} = true ]; then
   check_result $?
 
   # test application with default user
-  test_openshift_sample_app
+  test_openshift_sample_app "${IMAGE_NAME}-testapp"
 
   # test application with random user
-  CONTAINER_ARGS="-u 12345" test_openshift_sample_app
+  CONTAINER_ARGS="-u 12345" test_openshift_sample_app "${IMAGE_NAME}-testapp"
 
   info "All tests for the ${sample_app_url} finished successfully."
   cleanup "ignore-me"
@@ -471,18 +517,7 @@ else
   done
 
   for app in ${WEB_APPS[@]}; do
-    prepare ${app}
-    run_s2i_build ${app}
-    check_result $?
-
-    # test application with default user
-    test_web_application
-
-    # test application with random user
-    CONTAINER_ARGS="-u 12345" test_web_application
-
-    info "All tests for the ${app} finished successfully."
-    cleanup ${app}
+    test_web_application "${app}"
   done
 
   test_new_web_app

2.0/contrib/etc/generate_container_user renamed to 2.0/build/contrib/etc/generate_container_user

@@ -0,0 +1,48 @@
+FROM rhel7
+# This image provides a .NET Core 2.0 environment you can use to run your .NET
+# applications.
+
+EXPOSE 8080
+
+ENV DOTNET_CORE_VERSION=2.0
+
+# Default to UTF-8 file.encoding
+ENV LANG=C.UTF-8 \
+    HOME=/opt/app-root \
+    PATH=/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+LABEL io.k8s.description="Platform for running .NET Core 2.0 applications" \
+      io.k8s.display-name=".NET Core 2.0" \
+      io.openshift.tags="runtime,.net,dotnet,dotnetcore,rh-dotnet20-runtime" \
+      io.openshift.expose-services="8080:http"
+
+# Labels consumed by Red Hat build service
+LABEL name="dotnet/dotnet-20-rhel7-runtime" \
+      com.redhat.component="rh-dotnet20-runtime-docker" \
+      version="2.0" \
+      release="1" \
+      architecture="x86_64"
+
+# Don't download/extract docs for nuget packages
+ENV NUGET_XMLDOC_MODE=skip
+
+# Don't do initially populate of package cache
+ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+
+## By default, ASP.NET Core runs on port 5000. We configure it to match
+## the container port.
+ENV ASPNETCORE_URLS=http://*:8080
+
+RUN yum install -y --setopt=tsflags=nodocs nss_wrapper tar && \
+    yum clean all
+
+# TODO: remove upstream sdk
+# install upstream 2.0 sdk
+RUN yum install --disablerepo=\* --enablerepo=rhel-7-server-rpms -y libunwind libicu && \
+	yum clean all && \
+    curl https://download.microsoft.com/download/0/6/5/0656B047-5F2F-4281-A851-F30776F8616D/dotnet-dev-linux-x64.2.0.0-preview1-005977.tar.gz -o /tmp/dotnet-sdk.tar.gz && \
+    mkdir -p /opt/dotnet && \
+    tar xf /tmp/dotnet-sdk.tar.gz -C /opt/dotnet && \
+    ln -s /opt/dotnet/dotnet /usr/bin/dotnet; \
+	rm /tmp/dotnet-sdk.tar.gz; \
+	rm -rf /opt/dotnet/sdk