Compare commits

..

No commits in common. "factory" and "devel" have entirely different histories.

4 changed files with 24 additions and 92 deletions

View File

@ -1,6 +1,6 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# Copyright (c) 2025 SUSE LLC # Copyright (c) 2024 SUSE LLC
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -13,33 +13,31 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# You can contact the BCI team via https://github.com/SUSE/bci/discussions # You can contact the BCI team via https://github.com/SUSE/bci/discussions
#!UseOBSRepositories
#!BuildTag: opensuse/bci/golang:stable-1.%RELEASE%
#!BuildTag: opensuse/bci/golang:stable #!BuildTag: opensuse/bci/golang:stable
#!BuildTag: opensuse/bci/golang:%%golang_version%%-1.%RELEASE% #!BuildTag: opensuse/bci/golang:stable-1.%RELEASE%
#!BuildTag: opensuse/bci/golang:1.23
#!BuildTag: opensuse/bci/golang:1.23-1.%RELEASE%
#!BuildTag: opensuse/bci/golang:%%golang_version%% #!BuildTag: opensuse/bci/golang:%%golang_version%%
#!BuildTag: opensuse/bci/golang:1.24 #!BuildTag: opensuse/bci/golang:%%golang_version%%-1.%RELEASE%
#!BuildTag: opensuse/bci/golang:latest #!BuildTag: opensuse/bci/golang:latest
FROM opensuse/tumbleweed:latest FROM opensuse/tumbleweed:latest
RUN set -euo pipefail; \ RUN set -euo pipefail; zypper -n in --no-recommends go1.23 go1.23-doc make curl findutils gawk git-core procps util-linux; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
zypper -n install --no-recommends go1.24 go1.24-doc make curl findutils gawk git-core procps util-linux; \
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 # Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.bci.golang # labelprefix=org.opensuse.bci.golang
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Go 1.24 development" LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
LABEL org.opencontainers.image.description="Go 1.24 development container based on the openSUSE Tumbleweed Base Container Image." LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Go 1.23 development"
LABEL org.opencontainers.image.description="Go 1.23 development container based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.version="%%golang_version%%" LABEL org.opencontainers.image.version="%%golang_version%%"
LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.url="https://www.opensuse.org"
LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="openSUSE Project" LABEL org.opencontainers.image.vendor="openSUSE Project"
LABEL org.opencontainers.image.source="%SOURCEURL%" LABEL org.opencontainers.image.source="%SOURCEURL%"
LABEL org.opencontainers.image.ref.name="%%golang_version%%-1.%RELEASE%" LABEL org.opencontainers.image.ref.name="1.23-1.%RELEASE%"
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:%%golang_version%%-1.%RELEASE%" LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:1.23-1.%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
LABEL org.opensuse.release-stage="released" LABEL org.opensuse.release-stage="released"
@ -53,8 +51,8 @@ ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin
# only available on go's tsan_arch architectures # only available on go's tsan_arch architectures
#!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le #!ArchExclusiveLine: x86_64 aarch64 s390x ppc64le
RUN set -euo pipefail; if zypper -n install go1.24-race; then zypper -n clean; fi RUN set -euo pipefail; if zypper -n install go1.23-race; then zypper -n clean; fi
RUN set -euo pipefail; install -m 755 -d /go/bin /go/src RUN set -euo pipefail; install -m 755 -d /go/bin /go/src
RUN set -euo pipefail; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} RUN set -euo pipefail; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
WORKDIR /go WORKDIR /go

View File

@ -1,4 +1,4 @@
# Go 1.24 development container image # Go 1.23 development container image
![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green) ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)
@ -33,8 +33,8 @@ the following Dockerfile options.
### Building from `scratch` ### Building from `scratch`
```Dockerfile ```Dockerfile
# Build the application using the Go 1.24 development container image # Build the application using the Go 1.23 development container image
FROM registry.opensuse.org/opensuse/bci/golang:1.24 as build FROM registry.opensuse.org/opensuse/bci/golang:1.23 as build
WORKDIR /app WORKDIR /app
@ -72,13 +72,13 @@ There are situations when you don't want to run an application inside a containe
To compile the application, without running it inside a container instance, use the following command: To compile the application, without running it inside a container instance, use the following command:
```ShellSession ```ShellSession
$ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/bci/golang:1.24 go build -v $ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/bci/golang:1.23 go build -v
``` ```
To run the application tests inside a container, use the following command: To run the application tests inside a container, use the following command:
```ShellSession ```ShellSession
$ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/bci/golang:1.24 go test -v $ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/bci/golang:1.23 go test -v
``` ```
@ -88,8 +88,8 @@ The [SLE BCI General Purpose Base Containers](https://opensource.suse.com/bci-do
images offer four different options for deployment, depending on your exact requirements. images offer four different options for deployment, depending on your exact requirements.
```Dockerfile ```Dockerfile
# Build the application using the Go 1.24 development Container Image # Build the application using the Go 1.23 development Container Image
FROM registry.opensuse.org/opensuse/bci/golang:1.24 as build FROM registry.opensuse.org/opensuse/bci/golang:1.23 as build
WORKDIR /app WORKDIR /app
@ -103,7 +103,7 @@ COPY . ./
RUN go build -o /hello RUN go build -o /hello
# Bundle the application into a scratch image # Bundle the application into a scratch image
FROM registry.opensuse.org/opensuse/bci/bci-micro:latest FROM registry.suse.com/bci/bci-micro:15.4
COPY --from=build /hello /usr/local/bin/hello COPY --from=build /hello /usr/local/bin/hello
@ -121,7 +121,7 @@ for further details.
In addition to the standard SLE BCI development packages, the following tools In addition to the standard SLE BCI development packages, the following tools
are included in the image: are included in the image:
- go1.24-race - go1.23-race
- make - make
## Licensing ## Licensing

View File

@ -1,10 +1,9 @@
<services> <services>
<service mode="buildtime" name="docker_label_helper"/> <service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/> <service mode="buildtime" name="kiwi_metainfo_helper"/>
<service mode="buildtime" name="replace_using_package_version"> <service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param> <param name="file">Dockerfile</param>
<param name="regex">%%golang_version%%</param> <param name="regex">%%golang_version%%</param>
<param name="package">go1.24</param> <param name="package">go1.23</param>
<param name="parse-version">patch</param>
</service> </service>
</services> </services>

View File

@ -1,68 +1,3 @@
-------------------------------------------------------------------
Wed Feb 12 15:38:34 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
- go 1.24 for stable, move oldstable to 1.23
-------------------------------------------------------------------
Wed Jan 1 14:13:48 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
- update copyright year
-------------------------------------------------------------------
Fri Dec 20 10:46:43 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
- limit to patch level version to avoid the go language ecosystem from being confused
-------------------------------------------------------------------
Tue Dec 3 13:26:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
- Change attribute order in _service
-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
- remove nonsensical org.opencontainers.image.authors - duplication of .vendor
-------------------------------------------------------------------
Tue Oct 29 15:23:20 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
- drop tag_version-%RELEASE%
-------------------------------------------------------------------
Mon Oct 14 11:26:26 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
- make the version-%release tag the first one listed; remove duplicates where they existed; update image.ref/reference to point to the version-%release(-) tag
-------------------------------------------------------------------
Fri Oct 11 15:12:52 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
- make the tag with -%RELEASE% the first tag listed
-------------------------------------------------------------------
Sat Sep 28 08:15:08 UTC 2024 - Dirk Mueller <dmueller@suse.com>
- fix registry references in READMEs
-------------------------------------------------------------------
Wed Sep 25 17:36:16 UTC 2024 - Dirk Mueller <dmueller@suse.com>
- rerender installation step in multiple lines, allow uninstalling optional packages
-------------------------------------------------------------------
Wed Sep 25 17:12:11 UTC 2024 - Dirk Mueller <dmueller@suse.com>
- improved log cleaning
-------------------------------------------------------------------
Tue Sep 24 20:00:32 UTC 2024 - Dirk Mueller <dmueller@suse.com>
- remove release tags for additional_versions
-------------------------------------------------------------------
Thu Sep 12 10:37:22 UTC 2024 - Dirk Mueller <dmueller@suse.com>
- set useobsrepositories explicitly
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 6 11:30:01 UTC 2024 - Dirk Mueller <dmueller@suse.com> Fri Sep 6 11:30:01 UTC 2024 - Dirk Mueller <dmueller@suse.com>