Skip to content

Commit

Permalink
Merge pull request #1893 from SUSE/for-deploy-7
Browse files Browse the repository at this point in the history
🤖: Update build recipes for SP7
  • Loading branch information
dirkmueller authored Oct 25, 2024
2 parents 18f57be + 3eee7ad commit e8994dd
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 290 deletions.
11 changes: 2 additions & 9 deletions .obs/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@ staging_build:
target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
- branch_package:
source_project: home:defolos:BCI:CR:SLE-15-SP7
source_package: gcc-13-image
target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
- branch_package:
source_project: home:defolos:BCI:CR:SLE-15-SP7
source_package: gcc-7-image
source_package: gcc-14-image
target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
- branch_package:
source_project: home:defolos:BCI:CR:SLE-15-SP7
Expand Down Expand Up @@ -234,10 +230,7 @@ refresh_devel_BCI:
package: dotnet-8.0
- trigger_services:
project: devel:BCI:SLE-15-SP7
package: gcc-13-image
- trigger_services:
project: devel:BCI:SLE-15-SP7
package: gcc-7-image
package: gcc-14-image
- trigger_services:
project: devel:BCI:SLE-15-SP7
package: git-image
Expand Down
10 changes: 0 additions & 10 deletions gcc-13-image/_service

This file was deleted.

49 changes: 0 additions & 49 deletions gcc-13-image/gcc-13-image.changes

This file was deleted.

15 changes: 8 additions & 7 deletions gcc-13-image/Dockerfile → gcc-14-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@

#!BuildTag: bci/gcc:%%gcc_minor_version%%-%RELEASE%
#!BuildTag: bci/gcc:%%gcc_minor_version%%
#!BuildTag: bci/gcc:13-%RELEASE%
#!BuildTag: bci/gcc:13
#!BuildName: bci-gcc-13
#!BuildVersion: 15.7.13
#!BuildTag: bci/gcc:14-%RELEASE%
#!BuildTag: bci/gcc:14
#!BuildName: bci-gcc-14
#!BuildVersion: 15.7.14
FROM bci/bci-base:15.7

RUN set -euo pipefail; \
zypper -n install --no-recommends gcc13 gcc13-c++ make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; \
zypper -n install --no-recommends gcc14 gcc14-c++ make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; \
zypper -n clean; \
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}

Expand All @@ -42,6 +42,7 @@ LABEL org.opencontainers.image.ref.name="%%gcc_minor_version%%-%RELEASE%"
LABEL org.opensuse.reference="registry.suse.com/bci/gcc:%%gcc_minor_version%%-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="techpreview"
LABEL com.suse.supportlevel.until="2026-07-31"
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="beta"
Expand All @@ -51,6 +52,6 @@ ENV GCC_VERSION="%%gcc_minor_version%%"

# symlink all versioned gcc & g++ binaries to unversioned
# ones in /usr/local/bin so that plain gcc works
RUN set -euo pipefail; for gcc_bin in $(rpm -ql gcc13 gcc13-c++ |grep ^/usr/bin/ ); do \
ln -sf $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-13$||'); \
RUN set -euo pipefail; for gcc_bin in $(rpm -ql gcc14 gcc14-c++ |grep ^/usr/bin/ ); do \
ln -sf $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-14$||'); \
done
10 changes: 5 additions & 5 deletions gcc-13-image/README.md → gcc-14-image/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ below. The `Dockerfile` uses this image to build a custom container image,
copies the sources to a working directory, and compiles the application:

```Dockerfile
FROM registry.suse.com/bci/gcc:13
FROM registry.suse.com/bci/gcc:14
WORKDIR /src/
COPY . /src/
RUN gcc main.c src1.c src2.c
Expand All @@ -30,7 +30,7 @@ It is also possible to compile a static binary with gcc as part of a multistage
build:

```Dockerfile
FROM registry.suse.com/bci/gcc:13 as builder
FROM registry.suse.com/bci/gcc:14 as builder
WORKDIR /src/
COPY . /src/
RUN gcc -o app main.c src1.c src2.c
Expand Down Expand Up @@ -63,7 +63,7 @@ The GNU Compiler Collections supports a wide range of frontends. The container
image ships the C and C++ frontends available as `gcc` and `g++`
respectively. The following additional frontends can be installed from the
repository:
- `gcc13-fortran` for Fortran support
- `gcc14-fortran` for Fortran support


### Using the container image interactively
Expand All @@ -74,13 +74,13 @@ practical. One way to do this is to mount the working directory of an
application into the launched container and compile the application there:

```bash
podman run --rm -it -v $(pwd):/src/:Z registry.suse.com/bci/gcc:13 \
podman run --rm -it -v $(pwd):/src/:Z registry.suse.com/bci/gcc:14 \
gcc -o /src/app.out /src/*.c
```
or by invoking `make`
```bash
podman run --rm -it -v $(pwd):/src/:Z --workdir /src/ \
registry.suse.com/bci/gcc:13 \
registry.suse.com/bci/gcc:14 \
make
```

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion gcc-7-image/_service → gcc-14-image/_service
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%gcc_minor_version%%</param>
<param name="package">gcc7</param>
<param name="package">gcc14</param>
<param name="parse-version">minor</param>
</service>
</services>
4 changes: 4 additions & 0 deletions gcc-14-image/gcc-14-image.changes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------
Fri Oct 25 05:40:13 UTC 2024 - SUSE Update Bot <[email protected]>

- First version of the GNU Compiler Collection %%gcc_minor_version%% BCI
51 changes: 0 additions & 51 deletions gcc-7-image/Dockerfile

This file was deleted.

102 changes: 0 additions & 102 deletions gcc-7-image/README.md

This file was deleted.

7 changes: 0 additions & 7 deletions gcc-7-image/_constraints

This file was deleted.

49 changes: 0 additions & 49 deletions gcc-7-image/gcc-7-image.changes

This file was deleted.

0 comments on commit e8994dd

Please sign in to comment.