Skip to content

Commit

Permalink
Test build for #1718
Browse files Browse the repository at this point in the history
  • Loading branch information
SUSE Update Bot committed Sep 25, 2024
1 parent 14e2816 commit c740d30
Show file tree
Hide file tree
Showing 20 changed files with 631 additions and 15 deletions.
7 changes: 7 additions & 0 deletions .obs/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ staging_build:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: postgres-16-image
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
- branch_package:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: postgres-17-image
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
- branch_package:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: prometheus-image
Expand Down Expand Up @@ -370,6 +374,9 @@ refresh_devel_BCI:
- trigger_services:
project: devel:BCI:Tumbleweed
package: postgres-16-image
- trigger_services:
project: devel:BCI:Tumbleweed
package: postgres-17-image
- trigger_services:
project: devel:BCI:Tumbleweed
package: prometheus-image
Expand Down
8 changes: 4 additions & 4 deletions helm-image/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
To run Helm, use the following command:

```ShellSession
$ podman run --rm -it registry.opensuse.org/opensuse/helm:3.15 <helm-sub-command>
$ podman run --rm -it registry.opensuse.org/opensuse/helm:3.16 <helm-sub-command>
```

For instance, to display the Helm version, run:
```ShellSession
$ podman run --rm -it registry.opensuse.org/opensuse/helm:3.15 version --template='{{.Version}}'
v3.15
$ podman run --rm -it registry.opensuse.org/opensuse/helm:3.16 version --template='{{.Version}}'
v3.16
```

Refer to the full list of Helm commands, flags and environment variables, in the [official Helm documentation](https://helm.sh/docs/helm/helm/).
Expand All @@ -32,7 +32,7 @@ For a comprehensive guide on getting started with Helm, refer to the [official H
To interact with a Kubernetes cluster, mount the Kubernetes configuration file (`kubeconfig`) from the container host into the container (use the `--net=host` flag to allow the container to use the host’s network):

```ShellSession
$ podman run --rm -it --net=host -v /path/to/kubeconfig:/root/.kube/config:Z registry.opensuse.org/opensuse/helm:3.15
$ podman run --rm -it --net=host -v /path/to/kubeconfig:/root/.kube/config:Z registry.opensuse.org/opensuse/helm:3.16
```

## Licensing
Expand Down
12 changes: 6 additions & 6 deletions helm-image/helm-image.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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
-->
<!-- OBS-AddTag: opensuse/helm:3.15 opensuse/helm:3.15-%RELEASE% opensuse/helm:latest -->
<!-- OBS-AddTag: opensuse/helm:3.16 opensuse/helm:3.16-%RELEASE% opensuse/helm:latest -->
<!-- OBS-Imagerepo: obsrepositories:/ -->

<image schemaversion="7.4" name="helm-image" xmlns:suse_label_helper="com.suse.label_helper">
Expand All @@ -27,20 +27,20 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
<type image="docker" derived_from="obsrepositories:/opensuse/bci/bci-micro#latest">
<containerconfig
name="opensuse/helm"
tag="3.15"
additionaltags="3.15-%RELEASE%,latest">
tag="3.16"
additionaltags="3.16-%RELEASE%,latest">
<labels>
<suse_label_helper:add_prefix prefix="org.opensuse.application.helm">
<label name="org.opencontainers.image.authors" value="openSUSE (https://www.opensuse.org/)"/>
<label name="org.opencontainers.image.title" value="openSUSE Tumbleweed Kubernetes Package Manager"/>
<label name="org.opencontainers.image.description" value="Kubernetes Package Manager container based on the openSUSE Tumbleweed Base Container Image."/>
<label name="org.opencontainers.image.version" value="3.15"/>
<label name="org.opencontainers.image.version" value="3.16"/>
<label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
<label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
<label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
<label name="org.opencontainers.image.url" value="https://www.opensuse.org"/>
<label name="org.opencontainers.image.ref.name" value="3.15-%RELEASE%"/>
<label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/helm:3.15-%RELEASE%"/>
<label name="org.opencontainers.image.ref.name" value="3.16-%RELEASE%"/>
<label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/helm:3.16-%RELEASE%"/>
<label name="org.openbuildservice.disturl" value="%DISTURL%"/>
<label name="org.opensuse.release-stage" value="released"/>
<label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime#openSUSE_BCI"/>
Expand Down
2 changes: 1 addition & 1 deletion postgres-12-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

FROM opensuse/tumbleweed:latest

RUN set -euo pipefail; zypper -n in --no-recommends postgresql12-server findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
RUN set -euo pipefail; zypper -n in --no-recommends libpq5 postgresql12-server findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.application.postgres
Expand Down
1 change: 1 addition & 0 deletions postgres-12-image/_service
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
<param name="file">Dockerfile</param>
<param name="regex">%%pg_patch_version%%</param>
<param name="package">postgresql12-server</param>
<param name="parse-version">patch</param>
</service>
</services>
2 changes: 1 addition & 1 deletion postgres-13-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

FROM opensuse/tumbleweed:latest

RUN set -euo pipefail; zypper -n in --no-recommends postgresql13-server findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
RUN set -euo pipefail; zypper -n in --no-recommends libpq5 postgresql13-server findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.application.postgres
Expand Down
1 change: 1 addition & 0 deletions postgres-13-image/_service
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
<param name="file">Dockerfile</param>
<param name="regex">%%pg_patch_version%%</param>
<param name="package">postgresql13-server</param>
<param name="parse-version">patch</param>
</service>
</services>
2 changes: 1 addition & 1 deletion postgres-14-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

FROM opensuse/tumbleweed:latest

RUN set -euo pipefail; zypper -n in --no-recommends postgresql14-server findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
RUN set -euo pipefail; zypper -n in --no-recommends libpq5 postgresql14-server findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.application.postgres
Expand Down
1 change: 1 addition & 0 deletions postgres-14-image/_service
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
<param name="file">Dockerfile</param>
<param name="regex">%%pg_patch_version%%</param>
<param name="package">postgresql14-server</param>
<param name="parse-version">patch</param>
</service>
</services>
2 changes: 1 addition & 1 deletion postgres-15-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

FROM opensuse/tumbleweed:latest

RUN set -euo pipefail; zypper -n in --no-recommends postgresql15-server findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
RUN set -euo pipefail; zypper -n in --no-recommends libpq5 postgresql15-server findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.application.postgres
Expand Down
1 change: 1 addition & 0 deletions postgres-15-image/_service
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
<param name="file">Dockerfile</param>
<param name="regex">%%pg_patch_version%%</param>
<param name="package">postgresql15-server</param>
<param name="parse-version">patch</param>
</service>
</services>
2 changes: 1 addition & 1 deletion postgres-16-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

FROM opensuse/tumbleweed:latest

RUN set -euo pipefail; zypper -n in --no-recommends postgresql16-server findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
RUN set -euo pipefail; zypper -n in --no-recommends libpq5 postgresql16-server findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.application.postgres
Expand Down
1 change: 1 addition & 0 deletions postgres-16-image/_service
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
<param name="file">Dockerfile</param>
<param name="regex">%%pg_patch_version%%</param>
<param name="package">postgresql16-server</param>
<param name="parse-version">patch</param>
</service>
</services>
64 changes: 64 additions & 0 deletions postgres-17-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# SPDX-License-Identifier: PostgreSQL

# 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

#!UseOBSRepositories

#!BuildTag: opensuse/postgres:17
#!BuildTag: opensuse/postgres:17-%RELEASE%
#!BuildTag: opensuse/postgres:%%pg_minor_version%%
#!BuildTag: opensuse/postgres:%%pg_patch_version%%

FROM opensuse/tumbleweed:latest

RUN set -euo pipefail; zypper -n in --no-recommends libpq5 postgresql17-server findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.application.postgres
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 17"
LABEL org.opencontainers.image.description="PostgreSQL 17 container based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.version="%%pg_patch_version%%"
LABEL org.opencontainers.image.url="https://www.opensuse.org"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="openSUSE Project"
LABEL org.opencontainers.image.source="%SOURCEURL%"
LABEL org.opencontainers.image.ref.name="17-%RELEASE%"
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/postgres:17-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
LABEL org.opensuse.release-stage="released"
# endlabelprefix
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/postgres-17-image/README.md"
ENV LANG="en_US.utf8"
ENV PG_MAJOR="17"
ENV PG_VERSION="%%pg_minor_version%%"
ENV PGDATA="/var/lib/pgsql/data"

ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
CMD ["postgres"]
EXPOSE 5432
COPY docker-entrypoint.sh /usr/local/bin/
RUN set -euo pipefail; chmod +x /usr/local/bin/docker-entrypoint.sh; \
sed -i -e 's/exec gosu postgres "/exec setpriv --reuid=postgres --regid=postgres --clear-groups -- "/g' /usr/local/bin/docker-entrypoint.sh; \
mkdir /docker-entrypoint-initdb.d; \
install -m 1775 -o postgres -g postgres -d /run/postgresql; \
install -d -m 0700 -o postgres -g postgres $PGDATA; \
sed -ri "s|^#?(listen_addresses)\s*=\s*\S+.*|\1 = '*'|" /usr/share/postgresql17/postgresql.conf.sample

STOPSIGNAL SIGINT
HEALTHCHECK --interval=10s --start-period=10s --timeout=5s \
CMD pg_isready -U ${POSTGRES_USER:-postgres} -h localhost -p 5432

VOLUME $PGDATA
22 changes: 22 additions & 0 deletions postgres-17-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.
Loading

0 comments on commit c740d30

Please sign in to comment.