From e89c9dc59dd8781f22677039199518763cdafb26 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Briseno <94071409+dgarciabriseno@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:23:48 -0400 Subject: [PATCH 1/6] Enable jpip server --- compose.yaml | 8 ++++++++ compose/dockerfiles/esajpip.Dockerfile | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 compose/dockerfiles/esajpip.Dockerfile diff --git a/compose.yaml b/compose.yaml index 9e896a5..d61253e 100644 --- a/compose.yaml +++ b/compose.yaml @@ -74,6 +74,14 @@ services: target: /var/www/api.helioviewer.org - jp2_volume:/tmp/jp2 - cache:/var/www/helioviewer.org/cache + jpip: + image: dgarciabriseno/helioviewer-jpip + build: + dockerfile: ./compose/dockerfiles/esajpip.Dockerfile + ports: + - 8090:8090 + volumes: + - jp2_volume:/home/esajpip/images cli: image: dgarciabriseno/helioviewer-cli-dev build: diff --git a/compose/dockerfiles/esajpip.Dockerfile b/compose/dockerfiles/esajpip.Dockerfile new file mode 100644 index 0000000..4d3e36a --- /dev/null +++ b/compose/dockerfiles/esajpip.Dockerfile @@ -0,0 +1,26 @@ +FROM alpine:3.19 as builder +RUN < Date: Tue, 26 Mar 2024 15:42:55 -0400 Subject: [PATCH 2/6] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9cf9f48..1bd867d 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,9 @@ To run the dev environment, install [Docker](https://docs.docker.com/get-docker/ Once installed clone this repo and run docker compose: ```bash -git clone --recurse-submodules https://github.com/Helioviewer-Project/helioviewer.org-docker.git +git clone --recurse-submodules https://github.com/dgarciabriseno/helioviewer.org-docker.git cd helioviewer.org-docker +git checkout jpip docker compose up -d --wait ``` From 1797e04b186d195a01516e363bf3f0dc340f4f30 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Briseno <94071409+dgarciabriseno@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:03:08 -0400 Subject: [PATCH 3/6] Patch cli --- compose/dockerfiles/cli.Dockerfile | 23 ++++++++++++++--------- compose/scripts/headless_setup.sh | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/compose/dockerfiles/cli.Dockerfile b/compose/dockerfiles/cli.Dockerfile index 9da5efb..14f8259 100644 --- a/compose/dockerfiles/cli.Dockerfile +++ b/compose/dockerfiles/cli.Dockerfile @@ -3,7 +3,7 @@ WORKDIR /root COPY api/install/kakadu/Kakadu_v6_4_1-00781N_Linux-64-bit-Compiled.tar.gz /root/kdu.tar.gz RUN tar xzf kdu.tar.gz -FROM alpine +FROM --platform=linux/x86_64 alpine # set home to future user home directory ENV HOME=/home/admin @@ -11,14 +11,19 @@ ENV HOME=/home/admin COPY --from=builder /root/bin/* /usr/local/bin COPY --from=builder /root/lib/* /usr/lib WORKDIR $HOME -RUN adduser -D admin \ - && mkdir -p /tmp/jp2 && chown -R admin:admin /tmp/jp2 \ - && apk update \ - && apk add --virtual build-deps gcc python3-dev musl-dev mariadb-dev \ - && apk add --no-cache python3 expect gcompat mariadb-connector-c \ - && python3 -m venv venv \ - && venv/bin/pip install --no-cache-dir numpy sunpy matplotlib scipy glymur mysqlclient \ - && apk del --no-cache build-deps +RUN < Date: Tue, 2 Apr 2024 11:02:29 -0400 Subject: [PATCH 4/6] Add symlink to /tmp/jp2 --- compose/dockerfiles/esajpip.Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compose/dockerfiles/esajpip.Dockerfile b/compose/dockerfiles/esajpip.Dockerfile index 4d3e36a..ad968ab 100644 --- a/compose/dockerfiles/esajpip.Dockerfile +++ b/compose/dockerfiles/esajpip.Dockerfile @@ -21,6 +21,9 @@ mv /esajpip.tar.gz . tar xf esajpip.tar.gz rm esajpip.tar.gz EOF +VOLUME ["/home/esajpip/images"] +RUN ln -s /home/esajpip/images /tmp/jp2 + WORKDIR /home/esajpip/server/esajpip USER esajpip ENTRYPOINT ["/home/esajpip/server/esajpip/esajpip"] From 288b3eebdcf2b5bd5d5e4716f7ff5cf94bd5fb7f Mon Sep 17 00:00:00 2001 From: Daniel Garcia Briseno <94071409+dgarciabriseno@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:30:31 -0400 Subject: [PATCH 5/6] Create movies folder for jpx movies --- compose/scripts/api_startup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/compose/scripts/api_startup.sh b/compose/scripts/api_startup.sh index 6a5098f..3486134 100644 --- a/compose/scripts/api_startup.sh +++ b/compose/scripts/api_startup.sh @@ -17,6 +17,7 @@ popd bash /root/api_config.sh chmod 777 /var/www/api.helioviewer.org/log +mkdir /tmp/jp2/movies source /etc/apache2/envvars touch $READY_FILE From e2edf8c60bef13aa5183273741d4a23aacea04da Mon Sep 17 00:00:00 2001 From: Daniel Garcia Briseno <94071409+dgarciabriseno@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:55:38 -0400 Subject: [PATCH 6/6] Make /tmp/jp2/movies world accessable --- compose/scripts/api_startup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compose/scripts/api_startup.sh b/compose/scripts/api_startup.sh index 3486134..39413c5 100644 --- a/compose/scripts/api_startup.sh +++ b/compose/scripts/api_startup.sh @@ -17,7 +17,8 @@ popd bash /root/api_config.sh chmod 777 /var/www/api.helioviewer.org/log -mkdir /tmp/jp2/movies +mkdir -p /tmp/jp2/movies +chmod 777 /tmp/jp2/movies source /etc/apache2/envvars touch $READY_FILE