Skip to content

Commit

Permalink
Merge pull request #2043 from SUSE/for-deploy-Tumbleweed
Browse files Browse the repository at this point in the history
🤖: Update build recipes for Tumbleweed
  • Loading branch information
dirkmueller authored Nov 25, 2024
2 parents 070a8c5 + 9b5fce9 commit 0f9a384
Show file tree
Hide file tree
Showing 18 changed files with 167 additions and 9 deletions.
7 changes: 7 additions & 0 deletions .obs/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,10 @@ staging_build:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: python-3.12-image
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
- branch_package:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: python-3.13-image
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
- branch_package:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: distribution-image
Expand Down Expand Up @@ -400,6 +404,9 @@ refresh_devel_BCI:
- trigger_services:
project: devel:BCI:Tumbleweed
package: python-3.12-image
- trigger_services:
project: devel:BCI:Tumbleweed
package: python-3.13-image
- trigger_services:
project: devel:BCI:Tumbleweed
package: distribution-image
Expand Down
1 change: 1 addition & 0 deletions apache-tomcat-10-image/Dockerfile.openjdk17
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17-%RELEASE%
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17
#!BuildTag: opensuse/apache-tomcat:10.1-openjdk17
#!BcntSyncTag: apache-tomcat-10-image

FROM opensuse/bci/bci-micro:latest AS target
FROM opensuse/tumbleweed:latest AS builder
Expand Down
1 change: 1 addition & 0 deletions apache-tomcat-10-image/Dockerfile.openjdk21
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk21-%RELEASE%
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk21
#!BuildTag: opensuse/apache-tomcat:10.1-openjdk21
#!BcntSyncTag: apache-tomcat-10-image

FROM opensuse/bci/bci-micro:latest AS target
FROM opensuse/tumbleweed:latest AS builder
Expand Down
1 change: 1 addition & 0 deletions apache-tomcat-10-image/Dockerfile.openjdk23
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk23-%RELEASE%
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk23
#!BuildTag: opensuse/apache-tomcat:10.1-openjdk23
#!BcntSyncTag: apache-tomcat-10-image

FROM opensuse/bci/bci-micro:latest AS target
FROM opensuse/tumbleweed:latest AS builder
Expand Down
5 changes: 5 additions & 0 deletions apache-tomcat-10-image/apache-tomcat-10-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 25 08:19:23 UTC 2024 - SUSE Update Bot <[email protected]>

- Sync build counters across all container flavors

-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
1 change: 1 addition & 0 deletions apache-tomcat-9-image/Dockerfile.openjdk17
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17-%RELEASE%
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17
#!BuildTag: opensuse/apache-tomcat:9-openjdk17
#!BcntSyncTag: apache-tomcat-9-image

FROM opensuse/bci/bci-micro:latest AS target
FROM opensuse/tumbleweed:latest AS builder
Expand Down
1 change: 1 addition & 0 deletions apache-tomcat-9-image/Dockerfile.openjdk21
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk21-%RELEASE%
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk21
#!BuildTag: opensuse/apache-tomcat:9-openjdk21
#!BcntSyncTag: apache-tomcat-9-image

FROM opensuse/bci/bci-micro:latest AS target
FROM opensuse/tumbleweed:latest AS builder
Expand Down
5 changes: 5 additions & 0 deletions apache-tomcat-9-image/apache-tomcat-9-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 25 08:19:23 UTC 2024 - SUSE Update Bot <[email protected]>

- Sync build counters across all container flavors

-------------------------------------------------------------------
Wed Nov 13 13:40:30 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
1 change: 1 addition & 0 deletions cosign-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#!BuildTag: opensuse/cosign:%%cosign_version%%-%RELEASE%
#!BuildTag: opensuse/cosign:%%cosign_version%%
#!BuildTag: opensuse/cosign:2.4
#!BuildTag: opensuse/cosign:2
#!BuildTag: opensuse/cosign:latest

FROM opensuse/bci/bci-micro:latest AS target
Expand Down
5 changes: 5 additions & 0 deletions cosign-image/cosign-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Nov 24 08:03:54 UTC 2024 - SUSE Update Bot <[email protected]>

- Add major version tag

-------------------------------------------------------------------
Wed Nov 13 13:40:15 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
5 changes: 5 additions & 0 deletions pcp-image/pcp-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 25 07:33:17 UTC 2024 - SUSE Update Bot <[email protected]>

- Fix spelling mistakes

-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
4 changes: 2 additions & 2 deletions pcp-image/pmproxy.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ secure.enabled = true
#####################################################################
[discover]

# propogate archives from pmlogger(1) into Redis querying
# propagate archives from pmlogger(1) into Redis querying
enabled = true

# comma-separated metrics name (globs) to skip during discovery
Expand All @@ -63,7 +63,7 @@ enabled = true
count = 10

#####################################################################
## settings for fast, scalable time series quering via Redis
## settings for fast, scalable time series querying via Redis
[pmseries]
#####################################################################

Expand Down
14 changes: 7 additions & 7 deletions postfix-image/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ In all examples, `podman` can be replaced directly with `docker`.
- `SMTP_PORT=587` The relayhost port.
- `SMTP_USERNAME` Username to authenticate with on the relayserver.
- `SMTP_PASSWORD` Password of the SMTP user, alternative `SMTP_PASSWORD_FILE` could be used to point to a file with the password
- `SMTP_NETWORKS` Comma seperated subnets who are allowed to use the relay. E.g. `SMTP_NETWORKS='xxx.xxx.xxx.xxx/xx, xxx.xxx.xxx.xxx/xx'`. 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16 are preset.
- `SMTP_NETWORKS` Comma separated subnets who are allowed to use the relay. E.g. `SMTP_NETWORKS='xxx.xxx.xxx.xxx/xx, xxx.xxx.xxx.xxx/xx'`. 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16 are preset.
- `INET_PROTOCOLS` The network interface protocols used for connections. Valid values are "all", "ipv4", "ipv6" or "ipv4,ipv6". The default value is "ipv4".
- `MASQUERADE_DOMAINS` Comma separated list of domains that must have their subdomain structure stripped off.
- `MYDESTINATION` List of domains for which mails are delivered locally instead of forwarding to another machine.
Expand All @@ -62,8 +62,8 @@ In all examples, `podman` can be replaced directly with `docker`.
### Virtual mailbox related variables
- `VIRTUAL_MBOX=[0|1]` Create virtual mail boxes in /var/spool/vmail owned by user vmail.
- `VMAIL_UID=5000` User ID and group ID of the vmail user for virtual domains and mailboxes.
- `VIRTUAL_DOMAINS=` Whitespace seperated list of virtual domains, will be written to `/etc/postfix/vhosts`.
- `VIRTUAL_USERS=` Whitespace seperated list of virtual users email addresses.
- `VIRTUAL_DOMAINS=` Whitespace separated list of virtual domains, will be written to `/etc/postfix/vhosts`.
- `VIRTUAL_USERS=` Whitespace separated list of virtual users email addresses.

### LDAP related variables
- `USE_LDAP=[0|1]` Use LDAP for virtual mail box user accounts.
Expand Down Expand Up @@ -97,13 +97,13 @@ environment variables, files or LDAP.

### Environment Variables

Beside the already mentioned environment variables, two futher variables
Beside the already mentioned environment variables, two further variables
define the virtual domains and the virtual users.
`VIRTUAL_DOMAINS="example.com example2.com example3.com"` is a whitespace
seperated list which can contain one or more virtual domains. For every
separated list which can contain one or more virtual domains. For every
domain, an own directory below `/var/spool/vmail` will be created.
`VIRTUAL_USERS="[email protected] [email protected] [email protected]"`
Whitespace seperated list of virtual users email addresses.
Whitespace separated list of virtual users email addresses.

The example call:
```sh
Expand Down Expand Up @@ -140,7 +140,7 @@ password `XXX`.
Instead of maintaining a long list of environment variables, the configuration
files could also be provided and mapped into /etc/postfix of the container.

`/etc/postfix/vhosts` contains the list of virtual domains seperated by
`/etc/postfix/vhosts` contains the list of virtual domains separated by
newlines:

```
Expand Down
5 changes: 5 additions & 0 deletions postfix-image/postfix-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 25 07:33:17 UTC 2024 - SUSE Update Bot <[email protected]>

- Fix spelling mistakes

-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
51 changes: 51 additions & 0 deletions python-3.13-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# 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

#!UseOBSRepositories

#!BuildTag: opensuse/bci/python:%%py313_ver%%-%RELEASE%
#!BuildTag: opensuse/bci/python:%%py313_ver%%
#!BuildTag: opensuse/bci/python:3.13
#!BuildTag: opensuse/bci/python:3

FROM opensuse/tumbleweed:latest

RUN set -euo pipefail; \
zypper -n install --no-recommends python313-devel python313 python313-pip curl findutils gawk git-core procps util-linux python313-wheel python313-pipx; \
zypper -n clean; \
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.bci.python
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Python 3.13 development"
LABEL org.opencontainers.image.description="Python 3.13 development container based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.version="%%py313_ver%%"
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="%%py313_ver%%-%RELEASE%"
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/python:%%py313_ver%%-%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/python-3.13-image/README.md"
ENV PYTHON_VERSION="%%py313_ver%%"
ENV PATH="$PATH:/root/.local/bin"
ENV PIP_VERSION="%%pip_ver%%"

RUN set -euo pipefail; install -d -m 0755 /root/.local/bin; ln -s /usr/bin/python3.13 /usr/local/bin/python3; \
ln -s /usr/bin/pydoc3.13 /usr/local/bin/pydoc
51 changes: 51 additions & 0 deletions python-3.13-image/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Python 3.13 development container image

![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)

## Description

[Python](https://www.python.org/) is an interpreted, interactive, object-oriented, open-source programming language. It incorporates modules, exceptions, dynamic typing, high-level dynamic data types, and classes. It provides interfaces to many system calls, libraries, and various window systems, and it is extensible in C or C++. It is also usable as an extension language for applications that require programmable interfaces.

## Usage

To deploy an application, install dependencies, copy the sources, and configure the application's main script:

```Dockerfile
FROM registry.opensuse.org/opensuse/bci/python:3.13

WORKDIR /app

COPY requirements.txt ./
RUN pip install --no-cache-dir -r requirements.txt

COPY . .

CMD [ "python3", "./main-script.py" ]
```

Build and run the container image:

```ShellSession
$ podman build -t my-python-app .
$ podman run -it --rm my-python-app
```

To run a single script inside a container, use the following command:

```ShellSession
$ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/bci/python:3.13 python3 script.py
```

## Additional tools

The Python container image includes [pip](https://pip.pypa.io/), [pipx](https://pipx.pypa.io/), [wheel](https://wheel.readthedocs.io/), Python Development Headers, and Git.

## Licensing

`SPDX-License-Identifier: MIT`

This documentation and the build recipe are licensed as MIT.
The container itself contains various software components under various open source licenses listed in the associated
Software Bill of Materials (SBOM).

This image is based on [openSUSE Tumbleweed](https://get.opensuse.org/tumbleweed/).
14 changes: 14 additions & 0 deletions python-3.13-image/_service
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<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">%%py313_ver%%</param>
<param name="package">python313-base</param>
</service>
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%pip_ver%%</param>
<param name="package">python313-pip</param>
</service>
</services>
4 changes: 4 additions & 0 deletions python-3.13-image/python-3.13-image.changes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------
Sun Nov 24 07:38:42 UTC 2024 - SUSE Update Bot <[email protected]>

- First version of the Python 3.13 development %%py313_ver%% BCI

0 comments on commit 0f9a384

Please sign in to comment.