Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions dirac/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM diracgrid/cc7-dirac
FROM cern/alma9-base

LABEL org.opencontainers.image.source=https://github.com/xenon-middleware/xenon-docker-images
LABEL org.opencontainers.image.documentation=https://github.com/xenon-middleware/xenon-docker-images/blob/dirac/dirac/README.md
LABEL org.opencontainers.image.licenses=Apache-2.0

ARG dirac_version=8.0.49
ARG dirac_pilot_version=v8r0p49
ARG diracos_version=2.42
ARG dirac_version=8.0.53
ARG dirac_pilot_version=v8r0p53
ARG diracos_version=2.43

# Use BUILDKIT_SANDBOX_HOSTNAME to force hostname
# see https://docs.docker.com/engine/reference/builder/#buildkit-built-in-build-args
Expand Down Expand Up @@ -120,9 +120,11 @@ RUN mkdir -p /cvmfs/dirac.egi.eu/dirac/${dirac_pilot_version} && \

COPY --chown=diracuser:diracuser dirac.client.cfg /home/diracuser/dirac.cfg

RUN yum install -y myproxy myproxy-server myproxy-admin
RUN chown dirac:dirac /var/lib/myproxy/
# docker run -ti --rm --privileged cern/alma9-base:latest bash
# RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
# RUN yum install -y https://github.com/apptainer/apptainer/releases/download/v1.3.4/apptainer-1.3.4-1.x86_64.rpm
# RUN yum install -y https://github.com/apptainer/apptainer/releases/download/v1.3.4/apptainer-suid-1.3.4-1.x86_64.rpm

COPY myproxy-server.config /etc/myproxy-server.config
# RUN apptainer run docker://alpine cat /etc/os-release

CMD ["/bin/entrypoint.sh"]
8 changes: 4 additions & 4 deletions dirac/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ and integration test scripts.
Run image from https://github.com/xenon-middleware/xenon-docker-images/pkgs/container/dirac with:

```shell
docker run --privileged --hostname dirac-tuto ghcr.io/xenon-middleware/dirac:8.0.49
docker run --privileged --hostname dirac-tuto ghcr.io/xenon-middleware/dirac:8.0.53
```
The `--privileged` flag is required to run apptainer containers inside Docker container.

Expand Down Expand Up @@ -56,7 +56,7 @@ This can be done with `docker-compose` see [../diracclient](diracclient/README.m
## Build

```shell
docker build -t ghcr.io/xenon-middleware/dirac:8.0.49 --progress plain \
docker build -t ghcr.io/xenon-middleware/dirac:8.0.53 --progress plain \
--build-arg BUILDKIT_SANDBOX_HOSTNAME=dirac-tuto .
```
During build need to interact with services which require host certificates.
Expand All @@ -68,8 +68,8 @@ The `--progress plain` makes it possible to see all the output logs.
Make sure to [configure Docker to be able to push to GitHub container registry](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#authenticating-to-the-container-registry).

```shell
docker push ghcr.io/xenon-middleware/dirac:8.0.49
docker tag ghcr.io/xenon-middleware/dirac:8.0.49 ghcr.io/xenon-middleware/dirac:latest
docker push ghcr.io/xenon-middleware/dirac:8.0.53
docker tag ghcr.io/xenon-middleware/dirac:8.0.53 ghcr.io/xenon-middleware/dirac:latest
docker push ghcr.io/xenon-middleware/dirac:latest
```

Expand Down
1 change: 0 additions & 1 deletion dirac/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@

mariadbd-safe &
/usr/sbin/sshd -De &
su -c "/usr/sbin/myproxy-server" dirac
/opt/dirac/sbin/runsvdir-start