Update everything according to the new supported versions across all …

…platforms. (#315)

2.1/build/Dockerfile

@@ -47,8 +47,8 @@ ENV ENABLED_COLLECTIONS="$ENABLED_COLLECTIONS rh-nodejs10" \
 # Needed for the `dotnet watch` to detect changes in a container.
     DOTNET_USE_POLLING_FILE_WATCHER=true \
 # Make all sdks aware of the latest ASP.NET Core version
-    LatestPatchVersionForAspNetCoreApp2_1=2.1.7 \
-    LatestPatchVersionForAspNetCoreAll2_1=2.1.7
+    LatestPatchVersionForAspNetCoreApp2_1=2.1.14 \
+    LatestPatchVersionForAspNetCoreAll2_1=2.1.14
 
 # Run container by default as user with id 1001 (default)
 USER 1001

2.1/build/Dockerfile.rhel7

@@ -48,8 +48,8 @@ ENV ENABLED_COLLECTIONS="$ENABLED_COLLECTIONS rh-nodejs10" \
 # Needed for the `dotnet watch` to detect changes in a container.
     DOTNET_USE_POLLING_FILE_WATCHER=true \
 # Make all sdks aware of the latest ASP.NET Core version
-    LatestPatchVersionForAspNetCoreApp2_1=2.1.13 \
-    LatestPatchVersionForAspNetCoreAll2_1=2.1.13
+    LatestPatchVersionForAspNetCoreApp2_1=2.1.15 \
+    LatestPatchVersionForAspNetCoreAll2_1=2.1.15
 
 # Run container by default as user with id 1001 (default)
 USER 1001

2.1/build/Dockerfile.rhel8

@@ -46,8 +46,8 @@ RUN chown -R 1001:0 /opt/app-root && fix-permissions /opt/app-root
 # Needed for the `dotnet watch` to detect changes in a container
 ENV  DOTNET_USE_POLLING_FILE_WATCHER=true \
 # Make all sdks aware of the latest ASP.NET Core version
-    LatestPatchVersionForAspNetCoreApp2_1=2.1.13 \
-    LatestPatchVersionForAspNetCoreAll2_1=2.1.13
+    LatestPatchVersionForAspNetCoreApp2_1=2.1.15 \
+    LatestPatchVersionForAspNetCoreAll2_1=2.1.15
 
 # Run container by default as user with id 1001 (default)
 USER 1001

2.1/build/README.md

@@ -38,9 +38,14 @@ Repository organization
 
 * **Dockerfile.rhel7**
 
-  RHEL based Dockerfile. In order to perform build or test actions on this
+  RHEL 7 based Dockerfile. In order to perform build or test actions on this
   Dockerfile you need to run the action on a properly subscribed RHEL machine.
 
+* **Dockerfile.rhel8**
+
+  UBI 8 / RHEL 8 based Dockerfile. No RHEL subscription is required, but without
+  one only UBI RPMs can be added to the container.
+
 * **Dockerfile**
 
   CentOS based Dockerfile.

2.1/build/test/run

@@ -47,19 +47,21 @@ npm_version=6.4.1
 
 if [ "$IMAGE_OS" = "CENTOS" ]; then
 # sdk version supported on CentOS
-sdk_version=2.1.505
-aspnet_latest_app_version=2.1.9
-aspnet_latest_all_version=2.1.9
+sdk_version=2.1.510
+aspnet_latest_app_version=2.1.14
+aspnet_latest_all_version=2.1.14
+npm_version=6.9.0
 elif [ "$IMAGE_OS" = "RHEL8" ]; then
 # sdk version supported on RHEL8
-sdk_version=2.1.509
-aspnet_latest_app_version=2.1.13
-aspnet_latest_all_version=2.1.13
+sdk_version=2.1.511
+aspnet_latest_app_version=2.1.15
+aspnet_latest_all_version=2.1.15
+npm_version=6.9.0
 elif [ "$IMAGE_OS" = "RHEL7" ]; then
 # sdk version supported on RHEL7
-sdk_version=2.1.509
-aspnet_latest_app_version=2.1.13
-aspnet_latest_all_version=2.1.13
+sdk_version=2.1.511
+aspnet_latest_app_version=2.1.15
+aspnet_latest_all_version=2.1.15
 fi
 
 sample_app_url="https://github.com/redhat-developer/s2i-dotnetcore-ex.git"

2.1/runtime/README.md

@@ -48,9 +48,14 @@ Repository organization
 
 * **Dockerfile.rhel7**
 
-  RHEL based Dockerfile. In order to perform build or test actions on this
+  RHEL 7 based Dockerfile. In order to perform build or test actions on this
   Dockerfile you need to run the action on a properly subscribed RHEL machine.
 
+* **Dockerfile.rhel8**
+
+  UBI 8 / RHEL 8 based Dockerfile. No RHEL subscription is required, but without
+  one only UBI RPMs can be added to the container.
+
 * **Dockerfile**
 
   CentOS based Dockerfile.

2.1/runtime/test/run

@@ -40,11 +40,11 @@ source ${test_dir}/testcommon
 dotnet_version_series=2.1
 
 if [ "$IMAGE_OS" = "CENTOS" ]; then
-dotnet_version=2.1.9
+dotnet_version=2.1.14
 elif [ "$IMAGE_OS" = "RHEL8" ]; then
-dotnet_version=2.1.13
+dotnet_version=2.1.15
 elif [ "$IMAGE_OS" = "RHEL7" ]; then
-dotnet_version=2.1.13
+dotnet_version=2.1.15
 fi
 
 test_dotnet() {

3.0/build/README.md

@@ -38,9 +38,14 @@ Repository organization
 
 * **Dockerfile.rhel7**
 
-  RHEL based Dockerfile. In order to perform build or test actions on this
+  RHEL 7 based Dockerfile. In order to perform build or test actions on this
   Dockerfile you need to run the action on a properly subscribed RHEL machine.
 
+* **Dockerfile.rhel8**
+
+  UBI 8 / RHEL 8 based Dockerfile. No RHEL subscription is required, but without
+  one only UBI RPMs can be added to the container.
+
 * **Dockerfile**
 
   CentOS based Dockerfile.

3.0/build/test/run

@@ -50,10 +50,10 @@ if [ "$IMAGE_OS" = "CENTOS" ]; then
 sdk_version=3.0.100
 elif [ "$IMAGE_OS" = "RHEL8" ]; then
 # sdk version supported on RHEL8
-sdk_version=3.0.100
+sdk_version=3.0.102
 elif [ "$IMAGE_OS" = "RHEL7" ]; then
 # sdk version supported on RHEL7
-sdk_version=3.0.100
+sdk_version=3.0.102
 fi
 
 sample_app_url="https://github.com/redhat-developer/s2i-dotnetcore-ex.git"

3.0/runtime/README.md

@@ -49,9 +49,14 @@ Repository organization
 
 * **Dockerfile.rhel7**
 
-  RHEL based Dockerfile. In order to perform build or test actions on this
+  RHEL 7 based Dockerfile. In order to perform build or test actions on this
   Dockerfile you need to run the action on a properly subscribed RHEL machine.
 
+* **Dockerfile.rhel8**
+
+  UBI 8 / RHEL 8 based Dockerfile. No RHEL subscription is required, but without
+  one only UBI RPMs can be added to the container.
+
 * **Dockerfile**
 
   CentOS based Dockerfile.

3.0/runtime/test/run

@@ -42,9 +42,9 @@ dotnet_version_series="3.0"
 if [ "$IMAGE_OS" = "CENTOS" ]; then
 dotnet_version="3.0.0"
 elif [ "$IMAGE_OS" = "RHEL8" ]; then
-dotnet_version="3.0.0"
+dotnet_version="3.0.2"
 elif [ "$IMAGE_OS" = "RHEL7" ]; then
-dotnet_version="3.0.0"
+dotnet_version="3.0.2"
 fi
 
 test_dotnet() {

3.1/build/README.md

@@ -38,9 +38,18 @@ Repository organization
 
 * **Dockerfile.rhel7**
 
-  RHEL based Dockerfile. In order to perform build or test actions on this
+  RHEL 7 based Dockerfile. In order to perform build or test actions on this
   Dockerfile you need to run the action on a properly subscribed RHEL machine.
 
+* **Dockerfile.rhel8**
+
+  UBI 8 / RHEL 8 based Dockerfile. No RHEL subscription is required, but without
+  one only UBI RPMs can be added to the container.
+
+* **Dockerfile.fedora**
+
+  Fedora based Dockerfile.
+
 * **Dockerfile**
 
   CentOS based Dockerfile.

3.1/build/test/run

@@ -53,14 +53,14 @@ if [ "$IMAGE_OS" = "CENTOS" ]; then
 sdk_version=3.1.100
 elif [ "$IMAGE_OS" = "RHEL8" ]; then
 # sdk version supported on RHEL8
-sdk_version=3.1.100
+sdk_version=3.1.101
 elif [ "$IMAGE_OS" = "RHEL7" ]; then
 # sdk version supported on RHEL7
-sdk_version=3.1.100
+sdk_version=3.1.101
 elif [ "$IMAGE_OS" = "FEDORA" ]; then
-# sdk version supported on RHEL7
-sdk_version=3.1.100
-npm_version=6.12.0
+# sdk version supported on Fedora
+sdk_version=3.1.100-preview3-014645
+npm_version=6.13.4
 fi
 
 sample_app_url="https://github.com/redhat-developer/s2i-dotnetcore-ex.git"

3.1/runtime/Dockerfile.rhel8

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/ubi8
+FROM ubi8
 # This image provides a .NET Core 3.1 environment you can use to run your .NET
 # applications.
 

3.1/runtime/README.md

@@ -49,9 +49,18 @@ Repository organization
 
 * **Dockerfile.rhel7**
 
-  RHEL based Dockerfile. In order to perform build or test actions on this
+  RHEL 7 based Dockerfile. In order to perform build or test actions on this
   Dockerfile you need to run the action on a properly subscribed RHEL machine.
 
+* **Dockerfile.rhel8**
+
+  UBI 8 / RHEL 8 based Dockerfile. No RHEL subscription is required, but without
+  one only UBI RPMs can be added to the container.
+
+* **Dockerfile.fedora**
+
+  Fedora based Dockerfile.
+
 * **Dockerfile**
 
   CentOS based Dockerfile.

3.1/runtime/test/run

@@ -44,11 +44,11 @@ dotnet_version_series="3.1"
 if [ "$IMAGE_OS" = "CENTOS" ]; then
 dotnet_version="3.1.0"
 elif [ "$IMAGE_OS" = "RHEL8" ]; then
-dotnet_version="3.1.0"
+dotnet_version="3.1.1"
 elif [ "$IMAGE_OS" = "RHEL7" ]; then
-dotnet_version="3.1.0"
+dotnet_version="3.1.1"
 elif [ "$IMAGE_OS" = "FEDORA" ]; then
-dotnet_version="3.1.0"
+dotnet_version="3.1.0-preview3.19553.2"
 fi
 
 test_dotnet() {

README.md

@@ -17,7 +17,7 @@ Versions
 * 2.1 (RHEL 7, RHEL 8, CentOS 7)
 * [RETIRED] 2.2 (RHEL 7, CentOS 7)
 * 3.0 (RHEL 7, RHEL 8)
-* 3.1 (RHEL 7, CentOS 7)
+* 3.1 (RHEL 7, RHEL 8, CentOS 7, Fedora)
 
 Building
 ----------------

build.sh

@@ -114,15 +114,15 @@ if [ "$IMAGE_OS" = "CENTOS" ]; then
   image_prefix="dotnet"
   docker_filename="Dockerfile"
 elif [ "$IMAGE_OS" = "RHEL8" ]; then
-  VERSIONS="${VERSIONS:-2.1}"
+  VERSIONS="${VERSIONS:-2.1 3.1}"
   image_prefix="ubi8"
   docker_filename="Dockerfile.rhel8"
 elif [ "$IMAGE_OS" = "FEDORA" ]; then
   VERSIONS="${VERSIONS:-3.1}"
   image_prefix="fedora"
   docker_filename="Dockerfile.fedora"
 else
-  VERSIONS="${VERSIONS:-2.1}"
+  VERSIONS="${VERSIONS:-2.1 3.1}"
   image_postfix="-rhel7"
   image_prefix="dotnet"
   docker_filename="Dockerfile.rhel7"

dotnet_imagestreams_rhel8.json

@@ -23,20 +23,41 @@
                         "name": "latest",
                         "annotations": {
                             "openshift.io/display-name": ".NET Core (Latest)",
-                            "description": "Build and run .NET Core applications on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core available on OpenShift, including major versions updates.",
+                            "description": "Build and run .NET Core applications on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core available on OpenShift, including major versions updates.",
                             "iconClass": "icon-dotnet",
                             "tags": "builder,.net,dotnet,dotnetcore",
                             "supports": "dotnet",
                             "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git",
                             "sampleContextDir": "app",
-                            "sampleRef": "dotnetcore-3.0"
+                            "sampleRef": "dotnetcore-3.1"
                         },
                         "referencePolicy": {
                             "type": "Local"
                         },
                         "from": {
                             "kind": "ImageStreamTag",
-                            "name": "3.0"
+                            "name": "3.1"
+                        }
+                    },
+                    {
+                        "name": "3.1",
+                        "annotations": {
+                            "openshift.io/display-name": ".NET Core 3.1",
+                            "description": "Build and run .NET Core 3.1 applications on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/build/README.md.",
+                            "iconClass": "icon-dotnet",
+                            "tags": "builder,.net,dotnet,dotnetcore,dotnet31",
+                            "supports": "dotnet:3.1,dotnet",
+                            "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git",
+                            "sampleContextDir": "app",
+                            "sampleRef": "dotnetcore-3.1",
+                            "version": "3.1"
+                        },
+                        "referencePolicy": {
+                            "type": "Local"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/ubi8/dotnet-31:3.1"
                         }
                     },
                     {
@@ -99,7 +120,7 @@
                         "name": "latest",
                         "annotations": {
                             "openshift.io/display-name": ".NET Core Runtime (Latest)",
-                            "description": "Run .NET Core applications on RHEL 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.0/runtime/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core Runtime available on OpenShift, including major versions updates.",
+                            "description": "Run .NET Core applications on RHEL 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core Runtime available on OpenShift, including major versions updates.",
                             "iconClass": "icon-dotnet",
                             "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime",
                             "supports": "dotnet-runtime"
@@ -109,7 +130,25 @@
                         },
                         "from": {
                             "kind": "ImageStreamTag",
-                            "name": "3.0"
+                            "name": "3.1"
+                        }
+                    },
+                    {
+                        "name": "3.1",
+                        "annotations": {
+                            "openshift.io/display-name": ".NET Core 3.1 Runtime",
+                            "description": "Run .NET Core applications on RHEL 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.",
+                            "iconClass": "icon-dotnet",
+                            "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime",
+                            "supports": "dotnet-runtime",
+                            "version": "3.1"
+                        },
+                        "referencePolicy": {
+                            "type": "Local"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/ubi8/dotnet-31-runtime:3.1"
                         }
                     },
                     {

test-imagestreams.sh

@@ -93,7 +93,7 @@ elif [[ "$IMAGE_OS" = "rhel7" ]]; then
   VERSIONS="${VERSIONS:-2.1 3.0 3.1}"
   imagestreams_file_name=dotnet_imagestreams.json
 elif [[ "$IMAGE_OS" = "rhel8" ]]; then
-  VERSIONS="${VERSIONS:-2.1 3.0}"
+  VERSIONS="${VERSIONS:-2.1 3.0 3.1}"
   imagestreams_file_name=dotnet_imagestreams_rhel8.json
 else
   echo 1>&2 "error: Unknown or unsupported OS '$IMAGE_OS'. Set the env var IMAGE_OS to override this."