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] 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 <<EOF
+adduser -D admin
+mkdir -p /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
+# lxml 5.2.0 is broken on x86 emulation on mac
+venv/bin/pip install --no-cache-dir numpy sunpy matplotlib scipy glymur mysqlclient lxml==5.1.1
+apk del --no-cache build-deps
+chown -R admin:admin /tmp/jp2
+chown -R admin:admin $HOME
+EOF
 
 WORKDIR $HOME
 # Copy remaining startup scripts
diff --git a/compose/scripts/headless_setup.sh b/compose/scripts/headless_setup.sh
index 58acd2c..36ba39d 100755
--- a/compose/scripts/headless_setup.sh
+++ b/compose/scripts/headless_setup.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 
-set timeout 5
+set timeout 30
 spawn python3 api/install/install.py
 
 expect "Location" { send "/tmp/jp2\r" }