From f8bd9f4dfd05e03c68b81d1cda59a25f4d713508 Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Wed, 17 Jan 2024 22:42:19 +0000 Subject: [PATCH 1/3] Build arm docker image for omero server --- Dockerfile | 23 +++++++++++++++++------ entrypoint.sh | 3 +-- requirements.yml | 2 ++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index b08e3297..ab6fbbf3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rockylinux:9 +FROM rockylinux:9.3 LABEL maintainer="ome-devel@lists.openmicroscopy.org.uk" RUN dnf -y install epel-release @@ -13,6 +13,8 @@ ADD playbook.yml requirements.yml /opt/setup/ RUN dnf install -y ansible-core sudo ca-certificates RUN ansible-galaxy install -p /opt/setup/roles -r requirements.yml + + RUN dnf -y clean all RUN rm -fr /var/cache @@ -27,17 +29,26 @@ RUN ansible-playbook playbook.yml -vvv -e 'ansible_python_interpreter=/usr/bin/p RUN dnf -y clean all RUN rm -fr /var/cache -RUN curl -L -o /usr/local/bin/dumb-init \ - https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 && \ - chmod +x /usr/local/bin/dumb-init -ADD entrypoint.sh /usr/local/bin/ +RUN dnf install -y https://dl.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os/Packages/b/bzip2-libs-1.0.8-8.el9.aarch64.rpm +RUN ln -s /usr/lib64/libbz2.so.1.0.8 /usr/lib64/libbz2.so.1.0 + + +WORKDIR /opt + +RUN source omero/server/venv3/bin/activate + +RUN dnf install -y https://dl.fedoraproject.org/pub/epel/8/Everything/aarch64/Packages/d/dumb-init-1.2.5-7.el8.aarch64.rpm + +ADD entrypoint.sh /usr/bin/ ADD 50-config.py 60-database.sh 99-run.sh /startup/ + USER omero-server EXPOSE 4063 4064 ENV PATH=$PATH:/opt/ice/bin VOLUME ["/OMERO", "/opt/omero/server/OMERO.server/var"] -ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] + +ENTRYPOINT ["/usr/bin/entrypoint.sh"] diff --git a/entrypoint.sh b/entrypoint.sh index 75d663e7..1dae21e0 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,5 +1,4 @@ -#!/usr/local/bin/dumb-init /bin/bash - +#!/usr/bin/dumb-init /bin/bash set -e source /opt/omero/server/venv3/bin/activate diff --git a/requirements.yml b/requirements.yml index 8988ba8a..c865c0aa 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,2 +1,4 @@ # External Ansible roles required by this repository - name: ome.omero_server + src: https://github.com/khaledk2/ansible-role-omero-server/ + version: aarch64_josh From 45f9f7f1e9beb5949e6fcd970503e622c599c0a3 Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Thu, 18 Jan 2024 01:00:03 +0000 Subject: [PATCH 2/3] clean up Dockerfile --- Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ab6fbbf3..25c1f5bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,11 +29,6 @@ RUN ansible-playbook playbook.yml -vvv -e 'ansible_python_interpreter=/usr/bin/p RUN dnf -y clean all RUN rm -fr /var/cache - -RUN dnf install -y https://dl.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os/Packages/b/bzip2-libs-1.0.8-8.el9.aarch64.rpm -RUN ln -s /usr/lib64/libbz2.so.1.0.8 /usr/lib64/libbz2.so.1.0 - - WORKDIR /opt RUN source omero/server/venv3/bin/activate From 55e94e02930766f35d66e267d3bf87ff44a6590c Mon Sep 17 00:00:00 2001 From: pwalczysko Date: Tue, 23 Jan 2024 16:40:05 +0000 Subject: [PATCH 3/3] Add blosc install to Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 25c1f5bd..7b270311 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN mkdir /opt/setup WORKDIR /opt/setup ADD playbook.yml requirements.yml /opt/setup/ -RUN dnf install -y ansible-core sudo ca-certificates +RUN dnf install -y ansible-core sudo ca-certificates blosc RUN ansible-galaxy install -p /opt/setup/roles -r requirements.yml