Skip to content

Commit

Permalink
Test build for #283
Browse files Browse the repository at this point in the history
  • Loading branch information
dcermak authored and SUSE Update Bot committed Mar 14, 2023
1 parent f5bd1c1 commit de56ce8
Show file tree
Hide file tree
Showing 14 changed files with 497 additions and 49 deletions.
7 changes: 7 additions & 0 deletions .obs/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ staging_build:
source_project: home:defolos:BCI:CR:SLE-15-SP4
source_package: rmt-mariadb-client-image
target_project: home:defolos:BCI:CR:SLE-15-SP4:Staging
- branch_package:
source_project: home:defolos:BCI:CR:SLE-15-SP4
source_package: postgres-15-image
target_project: home:defolos:BCI:CR:SLE-15-SP4:Staging
- branch_package:
source_project: home:defolos:BCI:CR:SLE-15-SP4
source_package: postgres-14-image
Expand Down Expand Up @@ -261,6 +265,9 @@ refresh_devel_BCI:
- trigger_services:
project: devel:BCI:SLE-15-SP4
package: rmt-mariadb-client-image
- trigger_services:
project: devel:BCI:SLE-15-SP4
package: postgres-15-image
- trigger_services:
project: devel:BCI:SLE-15-SP4
package: postgres-14-image
Expand Down
12 changes: 6 additions & 6 deletions aspnet-runtime-6.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ COPY microsoft.asc /tmp

RUN mkdir -p /tmp/

#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-6.0.14-x64.rpm
COPY dotnet-host-6.0.14-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-6.0.14-x64.rpm
COPY dotnet-hostfxr-6.0.14-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-6.0.14-sles.12-x64.rpm
COPY dotnet-runtime-deps-6.0.14-sles.12-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-6.0.15-x64.rpm
COPY dotnet-host-6.0.15-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-6.0.15-x64.rpm
COPY dotnet-hostfxr-6.0.15-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-6.0.15-sles.12-x64.rpm
COPY dotnet-runtime-deps-6.0.15-sles.12-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-6.0.14-x64.rpm
COPY dotnet-runtime-6.0.14-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-runtime-6.0.14-x64.rpm
Expand Down
12 changes: 6 additions & 6 deletions aspnet-runtime-7.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ COPY microsoft.asc /tmp

RUN mkdir -p /tmp/

#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-7.0.3-x64.rpm
COPY dotnet-host-7.0.3-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-7.0.3-x64.rpm
COPY dotnet-hostfxr-7.0.3-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-7.0.3-sles.12-x64.rpm
COPY dotnet-runtime-deps-7.0.3-sles.12-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-7.0.4-x64.rpm
COPY dotnet-host-7.0.4-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-7.0.4-x64.rpm
COPY dotnet-hostfxr-7.0.4-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-7.0.4-sles.12-x64.rpm
COPY dotnet-runtime-deps-7.0.4-sles.12-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-7.0.3-x64.rpm
COPY dotnet-runtime-7.0.3-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-runtime-7.0.3-x64.rpm
Expand Down
24 changes: 12 additions & 12 deletions dotnet-6.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,22 @@ COPY microsoft.asc /tmp

RUN mkdir -p /tmp/

#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-6.0.14-x64.rpm
COPY dotnet-host-6.0.14-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-6.0.15-x64.rpm
COPY dotnet-host-6.0.15-x64.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-6.0.14-x64.rpm
COPY dotnet-targeting-pack-6.0.14-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-6.0.14-x64.rpm
COPY dotnet-hostfxr-6.0.14-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-6.0.14-sles.12-x64.rpm
COPY dotnet-runtime-deps-6.0.14-sles.12-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-targeting-pack-6.0.15-x64.rpm
COPY dotnet-targeting-pack-6.0.15-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-6.0.15-x64.rpm
COPY dotnet-hostfxr-6.0.15-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-6.0.15-sles.12-x64.rpm
COPY dotnet-runtime-deps-6.0.15-sles.12-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-6.0.14-x64.rpm
COPY dotnet-runtime-6.0.14-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-apphost-pack-6.0.14-x64.rpm
COPY dotnet-apphost-pack-6.0.14-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-targeting-pack-6.0.14-x64.rpm
COPY aspnetcore-targeting-pack-6.0.14-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-apphost-pack-6.0.15-x64.rpm
COPY dotnet-apphost-pack-6.0.15-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-targeting-pack-6.0.15-x64.rpm
COPY aspnetcore-targeting-pack-6.0.15-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-runtime-6.0.14-x64.rpm
COPY aspnetcore-runtime-6.0.14-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-sdk-6.0.406-x64.rpm
Expand Down
24 changes: 12 additions & 12 deletions dotnet-7.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,22 @@ COPY microsoft.asc /tmp

RUN mkdir -p /tmp/

#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-7.0.3-x64.rpm
COPY dotnet-host-7.0.3-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-7.0.4-x64.rpm
COPY dotnet-host-7.0.4-x64.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-7.0.3-x64.rpm
COPY dotnet-targeting-pack-7.0.3-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-7.0.3-x64.rpm
COPY dotnet-hostfxr-7.0.3-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-7.0.3-sles.12-x64.rpm
COPY dotnet-runtime-deps-7.0.3-sles.12-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-targeting-pack-7.0.4-x64.rpm
COPY dotnet-targeting-pack-7.0.4-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-7.0.4-x64.rpm
COPY dotnet-hostfxr-7.0.4-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-7.0.4-sles.12-x64.rpm
COPY dotnet-runtime-deps-7.0.4-sles.12-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-7.0.3-x64.rpm
COPY dotnet-runtime-7.0.3-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-apphost-pack-7.0.3-x64.rpm
COPY dotnet-apphost-pack-7.0.3-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-targeting-pack-7.0.3-x64.rpm
COPY aspnetcore-targeting-pack-7.0.3-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-apphost-pack-7.0.4-x64.rpm
COPY dotnet-apphost-pack-7.0.4-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-targeting-pack-7.0.4-x64.rpm
COPY aspnetcore-targeting-pack-7.0.4-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-runtime-7.0.3-x64.rpm
COPY aspnetcore-runtime-7.0.3-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-sdk-7.0.201-x64.rpm
Expand Down
12 changes: 6 additions & 6 deletions dotnet-runtime-6.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ COPY microsoft.asc /tmp

RUN mkdir -p /tmp/

#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-6.0.14-x64.rpm
COPY dotnet-host-6.0.14-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-6.0.14-x64.rpm
COPY dotnet-hostfxr-6.0.14-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-6.0.14-sles.12-x64.rpm
COPY dotnet-runtime-deps-6.0.14-sles.12-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-6.0.15-x64.rpm
COPY dotnet-host-6.0.15-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-6.0.15-x64.rpm
COPY dotnet-hostfxr-6.0.15-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-6.0.15-sles.12-x64.rpm
COPY dotnet-runtime-deps-6.0.15-sles.12-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-6.0.14-x64.rpm
COPY dotnet-runtime-6.0.14-x64.rpm /tmp/

Expand Down
12 changes: 6 additions & 6 deletions dotnet-runtime-7.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ COPY microsoft.asc /tmp

RUN mkdir -p /tmp/

#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-7.0.3-x64.rpm
COPY dotnet-host-7.0.3-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-7.0.3-x64.rpm
COPY dotnet-hostfxr-7.0.3-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-7.0.3-sles.12-x64.rpm
COPY dotnet-runtime-deps-7.0.3-sles.12-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-7.0.4-x64.rpm
COPY dotnet-host-7.0.4-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-7.0.4-x64.rpm
COPY dotnet-hostfxr-7.0.4-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-7.0.4-sles.12-x64.rpm
COPY dotnet-runtime-deps-7.0.4-sles.12-x64.rpm /tmp/
#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-7.0.3-x64.rpm
COPY dotnet-runtime-7.0.3-x64.rpm /tmp/

Expand Down
1 change: 0 additions & 1 deletion postgres-14-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#!BuildTag: suse/postgres:14-%RELEASE%
#!BuildTag: suse/postgres:%%pg_version%%
#!BuildTag: suse/postgres:%%pg_version%%-%RELEASE%
#!BuildTag: suse/postgres:latest
#!BuildVersion: 15.4.14
FROM suse/sle15:15.4

Expand Down
48 changes: 48 additions & 0 deletions postgres-15-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# SPDX-License-Identifier: MIT
#!BuildTag: suse/postgres:15
#!BuildTag: suse/postgres:15-%RELEASE%
#!BuildTag: suse/postgres:%%pg_version%%
#!BuildTag: suse/postgres:%%pg_version%%-%RELEASE%
#!BuildTag: suse/postgres:latest
#!BuildVersion: 15.4.15
FROM suse/sle15:15.4

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

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=com.suse.application.postgres
LABEL org.opencontainers.image.title="SLE PostgreSQL 15 Container Image"
LABEL org.opencontainers.image.description="PostgreSQL 15 based on the SLE Base Container Image."
LABEL org.opencontainers.image.version="15"
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/suse/postgres:15-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="l3"
LABEL com.suse.eula="sle-bci"
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
LABEL com.suse.image-type="application"
LABEL com.suse.release-stage="released"
# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends postgresql15-server distribution-release; zypper -n clean; rm -rf /var/log/*
ENV LANG="en_US.utf8"
ENV PG_MAJOR="15"
ENV PG_VERSION="%%pg_version%%"
ENV PGDATA="/var/lib/postgresql/data"

ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
CMD ["postgres"]
VOLUME /var/lib/postgresql/data
EXPOSE 5432
COPY docker-entrypoint.sh /usr/local/bin/
RUN set -euo pipefail; chmod +x /usr/local/bin/docker-entrypoint.sh; \
ln -s su /usr/bin/gosu; \
mkdir /docker-entrypoint-initdb.d; \
sed -ri "s|^#?(listen_addresses)\s*=\s*\S+.*|\1 = '*'|" /usr/share/postgresql15/postgresql.conf.sample

STOPSIGNAL SIGINT
HEALTHCHECK --interval=10s --start-period=10s --timeout=5s \
CMD pg_isready -U ${POSTGRES_USER:-postgres} -h localhost -p 5432
22 changes: 22 additions & 0 deletions postgres-15-image/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Copyright (c) 2014, Docker PostgreSQL Authors (See AUTHORS)

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.
7 changes: 7 additions & 0 deletions postgres-15-image/_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>
10 changes: 10 additions & 0 deletions postgres-15-image/_service
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%pg_version%%</param>
<param name="package">postgresql15-server</param>
<param name="parse-version">minor</param>
</service>
</services>
Loading

0 comments on commit de56ce8

Please sign in to comment.