Skip to content

Commit f6edb73

Browse files
authored
Sync with downstream containers. (#207)
1 parent a0cbfe0 commit f6edb73

File tree

12 files changed

+15
-15
lines changed

12 files changed

+15
-15
lines changed

1.0/Dockerfile.rhel7

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ LABEL io.k8s.description="Platform for building and running .NET Core 1.0 applic
2222
LABEL name="dotnet/dotnetcore-10-rhel7" \
2323
com.redhat.component="rh-dotnetcore10-container" \
2424
version="1.0" \
25-
release="37" \
25+
release="40" \
2626
architecture="x86_64"
2727

2828
COPY ./root/usr/bin /usr/bin

1.0/test/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ image_dir=$(readlink -zf ${test_dir}/..)
4848
if [ "$BUILD_CENTOS" = "true" ]; then
4949
dotnet_version="1.0.0-preview2-003280"
5050
else
51-
dotnet_version="1.0.0-preview2-003280"
51+
dotnet_version="1.0.0-preview2-003301"
5252
fi
5353
sample_app_url="https://github.com/redhat-developer/s2i-dotnetcore-ex.git"
5454

1.1/Dockerfile.rhel7

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ LABEL io.k8s.description="Platform for building and running .NET Core 1.1 applic
2222
LABEL name="dotnet/dotnetcore-11-rhel7" \
2323
com.redhat.component="rh-dotnetcore11-container" \
2424
version="1.1" \
25-
release="28" \
25+
release="31" \
2626
architecture="x86_64"
2727

2828
COPY ./root/usr/bin /usr/bin

1.1/test/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ image_dir=$(readlink -zf ${test_dir}/..)
4040
if [ "$BUILD_CENTOS" = "true" ]; then
4141
dotnet_version="1.0.0-preview2-1-003232"
4242
else
43-
dotnet_version="1.0.0-preview2-1-003291"
43+
dotnet_version="1.0.0-preview2-1-003312"
4444
fi
4545
sample_app_url="https://github.com/redhat-developer/s2i-dotnetcore-ex.git"
4646

2.0/build/Dockerfile.rhel7

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LABEL io.k8s.description="Platform for building and running .NET Core 2.0 applic
1616
LABEL name="dotnet/dotnet-20-rhel7" \
1717
com.redhat.component="rh-dotnet20-container" \
1818
version="2.0" \
19-
release="21" \
19+
release="24" \
2020
architecture="x86_64"
2121

2222
# Labels consumed by Eclipse JBoss OpenShift plugin

2.0/build/test/run

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ if [ "$BUILD_CENTOS" = "true" ]; then
3535
sdk_latest_version="2.0.3"
3636
sdk_versions=( "2.0.3" )
3737
else
38-
sdk_latest_version="2.1.105"
39-
sdk_versions=( "2.0.3" "2.1.105" )
38+
sdk_latest_version="2.1.202"
39+
sdk_versions=( "2.0.3" "2.1.202" )
4040
fi
4141

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

2.0/runtime/Dockerfile.rhel7

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ LABEL io.k8s.description="Platform for running .NET Core 2.0 applications" \
2222
LABEL name="dotnet/dotnet-20-runtime-rhel7" \
2323
com.redhat.component="rh-dotnet20-runtime-container" \
2424
version="2.0" \
25-
release="21" \
25+
release="24" \
2626
architecture="x86_64"
2727

2828
# Don't download/extract docs for nuget packages

2.0/runtime/test/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ test_dir="$(readlink -zf $(dirname "${BASH_SOURCE[0]}"))"
2626
source ${test_dir}/testcommon
2727

2828
dotnet_version_series="2.0"
29-
dotnet_version_suffix="7"
29+
dotnet_version_suffix="9"
3030
dotnet_version="${dotnet_version_series}.${dotnet_version_suffix}"
3131

3232
test_dotnet() {

2.1/build/Dockerfile.rhel7

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LABEL io.k8s.description="Platform for building and running .NET Core 2.1 applic
1616
LABEL name="dotnet/dotnet-21-rhel7" \
1717
com.redhat.component="rh-dotnet21-container" \
1818
version="2.1" \
19-
release="1" \
19+
release="4" \
2020
architecture="x86_64"
2121

2222
# Labels consumed by Eclipse JBoss OpenShift plugin

2.1/build/test/run

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ sdk_default_version="2.1.302"
3535
sdk_latest_version="2.1.302"
3636
sdk_versions=( "2.1.302" )
3737
else
38-
sdk_default_version="2.1.301"
39-
sdk_latest_version="2.1.301"
40-
sdk_versions=( "2.1.301" )
38+
sdk_default_version="2.1.302"
39+
sdk_latest_version="2.1.302"
40+
sdk_versions=( "2.1.302" )
4141
fi
4242

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

2.1/runtime/Dockerfile.rhel7

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ LABEL io.k8s.description="Platform for running .NET Core 2.1 applications" \
2323
LABEL name="dotnet/dotnet-21-runtime-rhel7" \
2424
com.redhat.component="rh-dotnet21-runtime-container" \
2525
version="2.1" \
26-
release="1" \
26+
release="4" \
2727
architecture="x86_64"
2828

2929
# Don't download/extract docs for nuget packages

2.1/runtime/test/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ test_dir="$(readlink -zf $(dirname "${BASH_SOURCE[0]}"))"
2626
source ${test_dir}/testcommon
2727

2828
dotnet_version_series="2.1"
29-
dotnet_version_suffix="300"
29+
dotnet_version_suffix="302"
3030
dotnet_version="${dotnet_version_series}.${dotnet_version_suffix}"
3131

3232
test_dotnet() {

0 commit comments

Comments
 (0)