Skip to content

Commit 971e0f8

Browse files
aslicerhaslicerh
authored
Update everything according to the new supported versions across all platforms. (#315)
1 parent 7588be6 commit 971e0f8

20 files changed

+125
-46
lines changed

‎2.1/build/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ ENV ENABLED_COLLECTIONS="$ENABLED_COLLECTIONS rh-nodejs10" \
4747
# Needed for the `dotnet watch` to detect changes in a container.
4848
DOTNET_USE_POLLING_FILE_WATCHER=true \
4949
# Make all sdks aware of the latest ASP.NET Core version
50-
LatestPatchVersionForAspNetCoreApp2_1=2.1.7 \
51-
LatestPatchVersionForAspNetCoreAll2_1=2.1.7
50+
LatestPatchVersionForAspNetCoreApp2_1=2.1.14 \
51+
LatestPatchVersionForAspNetCoreAll2_1=2.1.14
5252

5353
# Run container by default as user with id 1001 (default)
5454
USER 1001

‎2.1/build/Dockerfile.rhel7

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ ENV ENABLED_COLLECTIONS="$ENABLED_COLLECTIONS rh-nodejs10" \
4848
# Needed for the `dotnet watch` to detect changes in a container.
4949
DOTNET_USE_POLLING_FILE_WATCHER=true \
5050
# Make all sdks aware of the latest ASP.NET Core version
51-
LatestPatchVersionForAspNetCoreApp2_1=2.1.13 \
52-
LatestPatchVersionForAspNetCoreAll2_1=2.1.13
51+
LatestPatchVersionForAspNetCoreApp2_1=2.1.15 \
52+
LatestPatchVersionForAspNetCoreAll2_1=2.1.15
5353

5454
# Run container by default as user with id 1001 (default)
5555
USER 1001

‎2.1/build/Dockerfile.rhel8

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ RUN chown -R 1001:0 /opt/app-root && fix-permissions /opt/app-root
4646
# Needed for the `dotnet watch` to detect changes in a container
4747
ENV DOTNET_USE_POLLING_FILE_WATCHER=true \
4848
# Make all sdks aware of the latest ASP.NET Core version
49-
LatestPatchVersionForAspNetCoreApp2_1=2.1.13 \
50-
LatestPatchVersionForAspNetCoreAll2_1=2.1.13
49+
LatestPatchVersionForAspNetCoreApp2_1=2.1.15 \
50+
LatestPatchVersionForAspNetCoreAll2_1=2.1.15
5151

5252
# Run container by default as user with id 1001 (default)
5353
USER 1001

‎2.1/build/README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,14 @@ Repository organization
3838

3939
* **Dockerfile.rhel7**
4040

41-
RHEL based Dockerfile. In order to perform build or test actions on this
41+
RHEL 7 based Dockerfile. In order to perform build or test actions on this
4242
Dockerfile you need to run the action on a properly subscribed RHEL machine.
4343

44+
* **Dockerfile.rhel8**
45+
46+
UBI 8 / RHEL 8 based Dockerfile. No RHEL subscription is required, but without
47+
one only UBI RPMs can be added to the container.
48+
4449
* **Dockerfile**
4550

4651
CentOS based Dockerfile.

‎2.1/build/test/run

+11-9
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,21 @@ npm_version=6.4.1
4747

4848
if [ "$IMAGE_OS" = "CENTOS" ]; then
4949
# sdk version supported on CentOS
50-
sdk_version=2.1.505
51-
aspnet_latest_app_version=2.1.9
52-
aspnet_latest_all_version=2.1.9
50+
sdk_version=2.1.510
51+
aspnet_latest_app_version=2.1.14
52+
aspnet_latest_all_version=2.1.14
53+
npm_version=6.9.0
5354
elif [ "$IMAGE_OS" = "RHEL8" ]; then
5455
# sdk version supported on RHEL8
55-
sdk_version=2.1.509
56-
aspnet_latest_app_version=2.1.13
57-
aspnet_latest_all_version=2.1.13
56+
sdk_version=2.1.511
57+
aspnet_latest_app_version=2.1.15
58+
aspnet_latest_all_version=2.1.15
59+
npm_version=6.9.0
5860
elif [ "$IMAGE_OS" = "RHEL7" ]; then
5961
# sdk version supported on RHEL7
60-
sdk_version=2.1.509
61-
aspnet_latest_app_version=2.1.13
62-
aspnet_latest_all_version=2.1.13
62+
sdk_version=2.1.511
63+
aspnet_latest_app_version=2.1.15
64+
aspnet_latest_all_version=2.1.15
6365
fi
6466

6567
sample_app_url="https://github.com/redhat-developer/s2i-dotnetcore-ex.git"

‎2.1/runtime/README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,14 @@ Repository organization
4848

4949
* **Dockerfile.rhel7**
5050

51-
RHEL based Dockerfile. In order to perform build or test actions on this
51+
RHEL 7 based Dockerfile. In order to perform build or test actions on this
5252
Dockerfile you need to run the action on a properly subscribed RHEL machine.
5353

54+
* **Dockerfile.rhel8**
55+
56+
UBI 8 / RHEL 8 based Dockerfile. No RHEL subscription is required, but without
57+
one only UBI RPMs can be added to the container.
58+
5459
* **Dockerfile**
5560

5661
CentOS based Dockerfile.

‎2.1/runtime/test/run

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ source ${test_dir}/testcommon
4040
dotnet_version_series=2.1
4141

4242
if [ "$IMAGE_OS" = "CENTOS" ]; then
43-
dotnet_version=2.1.9
43+
dotnet_version=2.1.14
4444
elif [ "$IMAGE_OS" = "RHEL8" ]; then
45-
dotnet_version=2.1.13
45+
dotnet_version=2.1.15
4646
elif [ "$IMAGE_OS" = "RHEL7" ]; then
47-
dotnet_version=2.1.13
47+
dotnet_version=2.1.15
4848
fi
4949

5050
test_dotnet() {

‎3.0/build/README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,14 @@ Repository organization
3838

3939
* **Dockerfile.rhel7**
4040

41-
RHEL based Dockerfile. In order to perform build or test actions on this
41+
RHEL 7 based Dockerfile. In order to perform build or test actions on this
4242
Dockerfile you need to run the action on a properly subscribed RHEL machine.
4343

44+
* **Dockerfile.rhel8**
45+
46+
UBI 8 / RHEL 8 based Dockerfile. No RHEL subscription is required, but without
47+
one only UBI RPMs can be added to the container.
48+
4449
* **Dockerfile**
4550

4651
CentOS based Dockerfile.

‎3.0/build/test/run

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ if [ "$IMAGE_OS" = "CENTOS" ]; then
5050
sdk_version=3.0.100
5151
elif [ "$IMAGE_OS" = "RHEL8" ]; then
5252
# sdk version supported on RHEL8
53-
sdk_version=3.0.100
53+
sdk_version=3.0.102
5454
elif [ "$IMAGE_OS" = "RHEL7" ]; then
5555
# sdk version supported on RHEL7
56-
sdk_version=3.0.100
56+
sdk_version=3.0.102
5757
fi
5858

5959
sample_app_url="https://github.com/redhat-developer/s2i-dotnetcore-ex.git"

‎3.0/runtime/README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,14 @@ Repository organization
4949

5050
* **Dockerfile.rhel7**
5151

52-
RHEL based Dockerfile. In order to perform build or test actions on this
52+
RHEL 7 based Dockerfile. In order to perform build or test actions on this
5353
Dockerfile you need to run the action on a properly subscribed RHEL machine.
5454

55+
* **Dockerfile.rhel8**
56+
57+
UBI 8 / RHEL 8 based Dockerfile. No RHEL subscription is required, but without
58+
one only UBI RPMs can be added to the container.
59+
5560
* **Dockerfile**
5661

5762
CentOS based Dockerfile.

‎3.0/runtime/test/run

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ dotnet_version_series="3.0"
4242
if [ "$IMAGE_OS" = "CENTOS" ]; then
4343
dotnet_version="3.0.0"
4444
elif [ "$IMAGE_OS" = "RHEL8" ]; then
45-
dotnet_version="3.0.0"
45+
dotnet_version="3.0.2"
4646
elif [ "$IMAGE_OS" = "RHEL7" ]; then
47-
dotnet_version="3.0.0"
47+
dotnet_version="3.0.2"
4848
fi
4949

5050
test_dotnet() {

‎3.1/build/README.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,18 @@ Repository organization
3838

3939
* **Dockerfile.rhel7**
4040

41-
RHEL based Dockerfile. In order to perform build or test actions on this
41+
RHEL 7 based Dockerfile. In order to perform build or test actions on this
4242
Dockerfile you need to run the action on a properly subscribed RHEL machine.
4343

44+
* **Dockerfile.rhel8**
45+
46+
UBI 8 / RHEL 8 based Dockerfile. No RHEL subscription is required, but without
47+
one only UBI RPMs can be added to the container.
48+
49+
* **Dockerfile.fedora**
50+
51+
Fedora based Dockerfile.
52+
4453
* **Dockerfile**
4554

4655
CentOS based Dockerfile.

‎3.1/build/test/run

+5-5
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ if [ "$IMAGE_OS" = "CENTOS" ]; then
5353
sdk_version=3.1.100
5454
elif [ "$IMAGE_OS" = "RHEL8" ]; then
5555
# sdk version supported on RHEL8
56-
sdk_version=3.1.100
56+
sdk_version=3.1.101
5757
elif [ "$IMAGE_OS" = "RHEL7" ]; then
5858
# sdk version supported on RHEL7
59-
sdk_version=3.1.100
59+
sdk_version=3.1.101
6060
elif [ "$IMAGE_OS" = "FEDORA" ]; then
61-
# sdk version supported on RHEL7
62-
sdk_version=3.1.100
63-
npm_version=6.12.0
61+
# sdk version supported on Fedora
62+
sdk_version=3.1.100-preview3-014645
63+
npm_version=6.13.4
6464
fi
6565

6666
sample_app_url="https://github.com/redhat-developer/s2i-dotnetcore-ex.git"

‎3.1/runtime/Dockerfile.rhel8

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8/ubi8
1+
FROM ubi8
22
# This image provides a .NET Core 3.1 environment you can use to run your .NET
33
# applications.
44

‎3.1/runtime/README.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,18 @@ Repository organization
4949

5050
* **Dockerfile.rhel7**
5151

52-
RHEL based Dockerfile. In order to perform build or test actions on this
52+
RHEL 7 based Dockerfile. In order to perform build or test actions on this
5353
Dockerfile you need to run the action on a properly subscribed RHEL machine.
5454

55+
* **Dockerfile.rhel8**
56+
57+
UBI 8 / RHEL 8 based Dockerfile. No RHEL subscription is required, but without
58+
one only UBI RPMs can be added to the container.
59+
60+
* **Dockerfile.fedora**
61+
62+
Fedora based Dockerfile.
63+
5564
* **Dockerfile**
5665

5766
CentOS based Dockerfile.

‎3.1/runtime/test/run

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ dotnet_version_series="3.1"
4444
if [ "$IMAGE_OS" = "CENTOS" ]; then
4545
dotnet_version="3.1.0"
4646
elif [ "$IMAGE_OS" = "RHEL8" ]; then
47-
dotnet_version="3.1.0"
47+
dotnet_version="3.1.1"
4848
elif [ "$IMAGE_OS" = "RHEL7" ]; then
49-
dotnet_version="3.1.0"
49+
dotnet_version="3.1.1"
5050
elif [ "$IMAGE_OS" = "FEDORA" ]; then
51-
dotnet_version="3.1.0"
51+
dotnet_version="3.1.0-preview3.19553.2"
5252
fi
5353

5454
test_dotnet() {

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Versions
1717
* 2.1 (RHEL 7, RHEL 8, CentOS 7)
1818
* [RETIRED] 2.2 (RHEL 7, CentOS 7)
1919
* 3.0 (RHEL 7, RHEL 8)
20-
* 3.1 (RHEL 7, CentOS 7)
20+
* 3.1 (RHEL 7, RHEL 8, CentOS 7, Fedora)
2121

2222
Building
2323
----------------

‎build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,15 @@ if [ "$IMAGE_OS" = "CENTOS" ]; then
114114
image_prefix="dotnet"
115115
docker_filename="Dockerfile"
116116
elif [ "$IMAGE_OS" = "RHEL8" ]; then
117-
VERSIONS="${VERSIONS:-2.1}"
117+
VERSIONS="${VERSIONS:-2.1 3.1}"
118118
image_prefix="ubi8"
119119
docker_filename="Dockerfile.rhel8"
120120
elif [ "$IMAGE_OS" = "FEDORA" ]; then
121121
VERSIONS="${VERSIONS:-3.1}"
122122
image_prefix="fedora"
123123
docker_filename="Dockerfile.fedora"
124124
else
125-
VERSIONS="${VERSIONS:-2.1}"
125+
VERSIONS="${VERSIONS:-2.1 3.1}"
126126
image_postfix="-rhel7"
127127
image_prefix="dotnet"
128128
docker_filename="Dockerfile.rhel7"

‎dotnet_imagestreams_rhel8.json

+44-5
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,41 @@
2323
"name": "latest",
2424
"annotations": {
2525
"openshift.io/display-name": ".NET Core (Latest)",
26-
"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.",
26+
"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.",
2727
"iconClass": "icon-dotnet",
2828
"tags": "builder,.net,dotnet,dotnetcore",
2929
"supports": "dotnet",
3030
"sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git",
3131
"sampleContextDir": "app",
32-
"sampleRef": "dotnetcore-3.0"
32+
"sampleRef": "dotnetcore-3.1"
3333
},
3434
"referencePolicy": {
3535
"type": "Local"
3636
},
3737
"from": {
3838
"kind": "ImageStreamTag",
39-
"name": "3.0"
39+
"name": "3.1"
40+
}
41+
},
42+
{
43+
"name": "3.1",
44+
"annotations": {
45+
"openshift.io/display-name": ".NET Core 3.1",
46+
"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.",
47+
"iconClass": "icon-dotnet",
48+
"tags": "builder,.net,dotnet,dotnetcore,dotnet31",
49+
"supports": "dotnet:3.1,dotnet",
50+
"sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git",
51+
"sampleContextDir": "app",
52+
"sampleRef": "dotnetcore-3.1",
53+
"version": "3.1"
54+
},
55+
"referencePolicy": {
56+
"type": "Local"
57+
},
58+
"from": {
59+
"kind": "DockerImage",
60+
"name": "registry.access.redhat.com/ubi8/dotnet-31:3.1"
4061
}
4162
},
4263
{
@@ -99,7 +120,7 @@
99120
"name": "latest",
100121
"annotations": {
101122
"openshift.io/display-name": ".NET Core Runtime (Latest)",
102-
"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.",
123+
"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.",
103124
"iconClass": "icon-dotnet",
104125
"tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime",
105126
"supports": "dotnet-runtime"
@@ -109,7 +130,25 @@
109130
},
110131
"from": {
111132
"kind": "ImageStreamTag",
112-
"name": "3.0"
133+
"name": "3.1"
134+
}
135+
},
136+
{
137+
"name": "3.1",
138+
"annotations": {
139+
"openshift.io/display-name": ".NET Core 3.1 Runtime",
140+
"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.",
141+
"iconClass": "icon-dotnet",
142+
"tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime",
143+
"supports": "dotnet-runtime",
144+
"version": "3.1"
145+
},
146+
"referencePolicy": {
147+
"type": "Local"
148+
},
149+
"from": {
150+
"kind": "DockerImage",
151+
"name": "registry.access.redhat.com/ubi8/dotnet-31-runtime:3.1"
113152
}
114153
},
115154
{

‎test-imagestreams.sh

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

0 commit comments

Comments
 (0)