Skip to content

Commit

Permalink
Merge pull request #836 from SUSE/for-deploy-5
Browse files Browse the repository at this point in the history
🤖: Update build recipes for SP5
  • Loading branch information
dirkmueller authored Jan 11, 2024
2 parents 52986e7 + 6182ed9 commit 86b062a
Show file tree
Hide file tree
Showing 31 changed files with 474 additions and 3 deletions.
21 changes: 21 additions & 0 deletions .obs/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@ staging_build:
source_project: home:defolos:BCI:CR:SLE-15-SP5
source_package: dotnet-7.0
target_project: home:defolos:BCI:CR:SLE-15-SP5:Staging
- branch_package:
source_project: home:defolos:BCI:CR:SLE-15-SP5
source_package: dotnet-8.0
target_project: home:defolos:BCI:CR:SLE-15-SP5:Staging
- branch_package:
source_project: home:defolos:BCI:CR:SLE-15-SP5
source_package: dotnet-runtime-6.0
Expand All @@ -173,6 +177,10 @@ staging_build:
source_project: home:defolos:BCI:CR:SLE-15-SP5
source_package: dotnet-runtime-7.0
target_project: home:defolos:BCI:CR:SLE-15-SP5:Staging
- branch_package:
source_project: home:defolos:BCI:CR:SLE-15-SP5
source_package: dotnet-runtime-8.0
target_project: home:defolos:BCI:CR:SLE-15-SP5:Staging
- branch_package:
source_project: home:defolos:BCI:CR:SLE-15-SP5
source_package: aspnet-runtime-6.0
Expand All @@ -181,6 +189,10 @@ staging_build:
source_project: home:defolos:BCI:CR:SLE-15-SP5
source_package: aspnet-runtime-7.0
target_project: home:defolos:BCI:CR:SLE-15-SP5:Staging
- branch_package:
source_project: home:defolos:BCI:CR:SLE-15-SP5
source_package: aspnet-runtime-8.0
target_project: home:defolos:BCI:CR:SLE-15-SP5:Staging
filters:
event: pull_request

Expand Down Expand Up @@ -309,18 +321,27 @@ refresh_devel_BCI:
- trigger_services:
project: devel:BCI:SLE-15-SP5
package: dotnet-7.0
- trigger_services:
project: devel:BCI:SLE-15-SP5
package: dotnet-8.0
- trigger_services:
project: devel:BCI:SLE-15-SP5
package: dotnet-runtime-6.0
- trigger_services:
project: devel:BCI:SLE-15-SP5
package: dotnet-runtime-7.0
- trigger_services:
project: devel:BCI:SLE-15-SP5
package: dotnet-runtime-8.0
- trigger_services:
project: devel:BCI:SLE-15-SP5
package: aspnet-runtime-6.0
- trigger_services:
project: devel:BCI:SLE-15-SP5
package: aspnet-runtime-7.0
- trigger_services:
project: devel:BCI:SLE-15-SP5
package: aspnet-runtime-8.0
filters:
event: push
branches:
Expand Down
1 change: 0 additions & 1 deletion aspnet-runtime-7.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#!BuildTag: bci/dotnet-aspnet:7.0-%RELEASE%
#!BuildTag: bci/dotnet-aspnet:7.0.15
#!BuildTag: bci/dotnet-aspnet:7.0.15-%RELEASE%
#!BuildTag: bci/dotnet-aspnet:latest
#!BuildName: bci-dotnet-aspnet-7.0
#!BuildVersion: 15.5.7.0
FROM suse/sle15:15.5
Expand Down
5 changes: 5 additions & 0 deletions aspnet-runtime-7.0/aspnet-runtime-7.0.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jan 11 09:59:50 UTC 2024 - Dan Čermák <[email protected]>

- Switch latest tag to .Net 8

-------------------------------------------------------------------
Thu Jan 11 07:39:54 UTC 2024 - Dan Čermák <[email protected]>

Expand Down
78 changes: 78 additions & 0 deletions aspnet-runtime-8.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# SPDX-License-Identifier: MIT

# Copyright (c) 2024 SUSE LLC

# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon.

# The content of THIS FILE IS AUTOGENERATED and should not be manually modified.
# It is maintained by the BCI team and generated by
# https://github.com/SUSE/BCI-dockerfile-generator

# Please submit bugfixes or comments via https://bugs.opensuse.org/
# You can contact the BCI team via https://github.com/SUSE/bci/discussions

#!ExclusiveArch: x86_64
#!BuildTag: bci/dotnet-aspnet:8.0
#!BuildTag: bci/dotnet-aspnet:8.0-%RELEASE%
#!BuildTag: bci/dotnet-aspnet:8.0.1
#!BuildTag: bci/dotnet-aspnet:8.0.1-%RELEASE%
#!BuildTag: bci/dotnet-aspnet:latest
#!BuildName: bci-dotnet-aspnet-8.0
#!BuildVersion: 15.5.8.0
FROM suse/sle15:15.5

MAINTAINER SUSE LLC (https://www.suse.com/)

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=com.suse.bci.dotnet.aspnet
LABEL org.opencontainers.image.title="SLE BCI ASP.NET 8.0 runtime"
LABEL org.opencontainers.image.description="The ASP.NET 8.0 runtime based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties."
LABEL org.opencontainers.image.version="8.0"
LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC"
LABEL org.opencontainers.image.source="%SOURCEURL%"
LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-aspnet:8.0-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="techpreview"
LABEL com.suse.eula="sle-bci"
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
LABEL com.suse.release-stage="released"
# endlabelprefix




# The MS GPG keys
COPY microsoft.asc /tmp

RUN mkdir -p /tmp/

#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-8.0.1-1.x86_64.rpm
COPY dotnet-host-8.0.1-1.x86_64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-8.0-8.0.1-1.x86_64.rpm
COPY dotnet-hostfxr-8.0-8.0.1-1.x86_64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-8.0-8.0.1-1.x86_64.rpm
COPY dotnet-runtime-deps-8.0-8.0.1-1.x86_64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-8.0-8.0.1-1.x86_64.rpm
COPY dotnet-runtime-8.0-8.0.1-1.x86_64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-runtime-8.0-8.0.1-1.x86_64.rpm
COPY aspnetcore-runtime-8.0-8.0.1-1.x86_64.rpm /tmp/

COPY prod.repo /tmp

# Workaround for https://github.com/openSUSE/obs-build/issues/487
RUN zypper --non-interactive install --no-recommends sles-release

# Importing MS GPG keys
RUN rpm --import /tmp/microsoft.asc

RUN zypper --non-interactive install --no-recommends libicu /tmp/*rpm

RUN cp /tmp/prod.repo /etc/zypp/repos.d/microsoft-dotnet-prod.repo

RUN zypper -n addlock dotnet-host

RUN rm -rf /tmp/* && zypper clean && rm -rf /var/log/*
17 changes: 17 additions & 0 deletions aspnet-runtime-8.0/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
8 changes: 8 additions & 0 deletions aspnet-runtime-8.0/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# SLE BCI ASP.NET 8.0 runtime

The .NET packages contained in this image come from a 3rd-party repository:
[packages.microsoft.com](https://packages.microsoft.com).

You can find the respective source code in
[github.com/dotnet](https://github.com/dotnet). SUSE doesn't provide any support
or warranties.
7 changes: 7 additions & 0 deletions aspnet-runtime-8.0/_constraints
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<constraints>
<hardware>
<disk>
<size unit="G">8</size>
</disk>
</hardware>
</constraints>
4 changes: 4 additions & 0 deletions aspnet-runtime-8.0/_service
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
</services>
4 changes: 4 additions & 0 deletions aspnet-runtime-8.0/aspnet-runtime-8.0.changes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------
Thu Jan 11 09:24:21 UTC 2024 - SUSE Update Bot <[email protected]>

- First version of the ASP.NET 8.0 runtime BCI
19 changes: 19 additions & 0 deletions aspnet-runtime-8.0/microsoft.asc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.7 (GNU/Linux)

mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT
LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV
7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag
OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j
H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr
M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs
ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC
AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH
/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe
MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy
7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV
KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ
XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+
NdCFTW7wY0Fb1fWJ+/KTsC4=
=J6gs
-----END PGP PUBLIC KEY BLOCK-----
6 changes: 6 additions & 0 deletions aspnet-runtime-8.0/prod.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[packages-microsoft-com-prod]
name=packages-microsoft-com-prod
baseurl=https://packages.microsoft.com/sles/15/prod/
enabled=1
gpgcheck=1
gpgkey=https://packages.microsoft.com/keys/microsoft.asc
1 change: 0 additions & 1 deletion dotnet-7.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#!BuildTag: bci/dotnet-sdk:7.0-%RELEASE%
#!BuildTag: bci/dotnet-sdk:7.0.15
#!BuildTag: bci/dotnet-sdk:7.0.15-%RELEASE%
#!BuildTag: bci/dotnet-sdk:latest
#!BuildName: bci-dotnet-sdk-7.0
#!BuildVersion: 15.5.7.0
FROM suse/sle15:15.5
Expand Down
5 changes: 5 additions & 0 deletions dotnet-7.0/dotnet-7.0.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jan 11 09:59:50 UTC 2024 - Dan Čermák <[email protected]>

- Switch latest tag to .Net 8

-------------------------------------------------------------------
Thu Jan 11 07:39:54 UTC 2024 - Dan Čermák <[email protected]>

Expand Down
89 changes: 89 additions & 0 deletions dotnet-8.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# SPDX-License-Identifier: MIT

# Copyright (c) 2024 SUSE LLC

# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon.

# The content of THIS FILE IS AUTOGENERATED and should not be manually modified.
# It is maintained by the BCI team and generated by
# https://github.com/SUSE/BCI-dockerfile-generator

# Please submit bugfixes or comments via https://bugs.opensuse.org/
# You can contact the BCI team via https://github.com/SUSE/bci/discussions

#!ExclusiveArch: x86_64
#!BuildTag: bci/dotnet-sdk:8.0
#!BuildTag: bci/dotnet-sdk:8.0-%RELEASE%
#!BuildTag: bci/dotnet-sdk:8.0.1
#!BuildTag: bci/dotnet-sdk:8.0.1-%RELEASE%
#!BuildTag: bci/dotnet-sdk:latest
#!BuildName: bci-dotnet-sdk-8.0
#!BuildVersion: 15.5.8.0
FROM suse/sle15:15.5

MAINTAINER SUSE LLC (https://www.suse.com/)

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=com.suse.bci.dotnet.sdk
LABEL org.opencontainers.image.title="SLE BCI .Net 8.0 SDK"
LABEL org.opencontainers.image.description="The .Net 8.0 SDK based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties."
LABEL org.opencontainers.image.version="8.0"
LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC"
LABEL org.opencontainers.image.source="%SOURCEURL%"
LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-sdk:8.0-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="techpreview"
LABEL com.suse.eula="sle-bci"
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
LABEL com.suse.release-stage="released"
# endlabelprefix


# telemetry opt out: https://docs.microsoft.com/en-us/dotnet/core/tools/telemetry#how-to-opt-out
ENV DOTNET_CLI_TELEMETRY_OPTOUT=1

# The MS GPG keys
COPY microsoft.asc /tmp

RUN mkdir -p /tmp/

#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-8.0.1-1.x86_64.rpm
COPY dotnet-host-8.0.1-1.x86_64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/n/netstandard-targeting-pack-2.1.0-x64.rpm
COPY netstandard-targeting-pack-2.1.0-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-targeting-pack-8.0-8.0.1-1.x86_64.rpm
COPY dotnet-targeting-pack-8.0-8.0.1-1.x86_64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-8.0-8.0.1-1.x86_64.rpm
COPY dotnet-hostfxr-8.0-8.0.1-1.x86_64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-8.0-8.0.1-1.x86_64.rpm
COPY dotnet-runtime-deps-8.0-8.0.1-1.x86_64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-8.0-8.0.1-1.x86_64.rpm
COPY dotnet-runtime-8.0-8.0.1-1.x86_64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-apphost-pack-8.0-8.0.1-1.x86_64.rpm
COPY dotnet-apphost-pack-8.0-8.0.1-1.x86_64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-targeting-pack-8.0-8.0.1-1.x86_64.rpm
COPY aspnetcore-targeting-pack-8.0-8.0.1-1.x86_64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-runtime-8.0-8.0.1-1.x86_64.rpm
COPY aspnetcore-runtime-8.0-8.0.1-1.x86_64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-sdk-8.0-8.0.101-1.x86_64.rpm
COPY dotnet-sdk-8.0-8.0.101-1.x86_64.rpm /tmp/

COPY prod.repo /tmp

# Workaround for https://github.com/openSUSE/obs-build/issues/487
RUN zypper --non-interactive install --no-recommends sles-release

# Importing MS GPG keys
RUN rpm --import /tmp/microsoft.asc

RUN zypper --non-interactive install --no-recommends libicu /tmp/*rpm

RUN cp /tmp/prod.repo /etc/zypp/repos.d/microsoft-dotnet-prod.repo

RUN zypper -n addlock dotnet-host

RUN rm -rf /tmp/* && zypper clean && rm -rf /var/log/*
17 changes: 17 additions & 0 deletions dotnet-8.0/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
8 changes: 8 additions & 0 deletions dotnet-8.0/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# SLE BCI .Net 8.0 SDK

The .NET packages contained in this image come from a 3rd-party repository:
[packages.microsoft.com](https://packages.microsoft.com).

You can find the respective source code in
[github.com/dotnet](https://github.com/dotnet). SUSE doesn't provide any support
or warranties.
7 changes: 7 additions & 0 deletions dotnet-8.0/_constraints
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<constraints>
<hardware>
<disk>
<size unit="G">8</size>
</disk>
</hardware>
</constraints>
4 changes: 4 additions & 0 deletions dotnet-8.0/_service
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
</services>
4 changes: 4 additions & 0 deletions dotnet-8.0/dotnet-8.0.changes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------
Thu Jan 11 09:24:21 UTC 2024 - SUSE Update Bot <[email protected]>

- First version of the .Net 8.0 SDK BCI
Loading

0 comments on commit 86b062a

Please sign in to comment.