make things work

This commit is contained in:
ebner 2025-01-21 12:21:12 +01:00
parent 166a31e363
commit 81bdf16322
3 changed files with 8 additions and 6 deletions

View File

@ -1,8 +1,10 @@
FROM container.psi.ch/images/rhel9 FROM container.psi.ch/images/rhel9
RUN dnf -y upgrade # RUN dnf -y upgrade
RUN dnf -y group install "Development Tools" RUN dnf -y group install "Development Tools"
RUN dnf -y install wget RUN dnf -y install wget
RUN dnf -y install python3 RUN dnf -y install python3
RUN dnf -y install nodejs
RUN dnf clean all
COPY files/rpmmacros /root/.rpmmacros COPY files/rpmmacros /root/.rpmmacros

View File

@ -7,12 +7,12 @@ This is the PSI rhel9 docker developer image. It contains most developer tools e
The image can be used as follows: The image can be used as follows:
```bash ```bash
docker run -it --rm container.psi.ch/images/rhel9-developer docker run -it --rm container.psi.ch/images/rhel9-developer-github-actions
``` ```
To build an RPM this image can be used as follows: To build an RPM this image can be used as follows:
```bash ```bash
docker run --platform linux/amd64 -it --rm -v $(pwd):/data --workdir /data container.psi.ch/images/rhel9-developer rpmbuild -ba whatever.spec docker run --platform linux/amd64 -it --rm -v $(pwd):/data --workdir /data container.psi.ch/images/rhel9-developer-github-actions rpmbuild -ba whatever.spec
``` ```
@ -26,11 +26,11 @@ in your Dockerfile
To build the image use: To build the image use:
```bash ```bash
docker build --platform linux/x86_64 -t container.psi.ch/images/rhel9-developer . docker build --platform linux/x86_64 -t container.psi.ch/images/rhel9-developer-github-actions .
``` ```
To push the image to the central container registry do: To push the image to the central container registry do:
```bash ```bash
docker login container.psi.ch docker login container.psi.ch
docker push container.psi.ch/images/rhel9-developer docker push container.psi.ch/images/rhel9-developer-github-actions
``` ```

View File

@ -1,4 +1,4 @@
%_topdir /data %_topdir %{getenv:PWD}
%_builddir %{_topdir}/BUILD %_builddir %{_topdir}/BUILD
%_buildrootdir %{_topdir}/BUILDROOT %_buildrootdir %{_topdir}/BUILDROOT
%_rpmdir %{_topdir}/RPMS %_rpmdir %{_topdir}/RPMS