From bc7408c76d7a1c58d53da0e6d8eef7524f36e55d Mon Sep 17 00:00:00 2001
From: Adam Lavin <adam@lavoaster.co.uk>
Date: Sun, 28 Mar 2021 18:59:18 +0100
Subject: [PATCH] Actually add an alpine compatible version of AtomicParsley

---
 Dockerfile                      | 22 ++++++++++++----------
 docker/AtomicParsley/Dockerfile | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 docker/AtomicParsley/Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 754ddba4..e6a9e626 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,14 @@
 FROM jrottenberg/ffmpeg:4.3-alpine312 as ffmpeg
+
+FROM alpine:3.12 as atomicparsley_builder
+
+RUN apk add --no-cache make cmake linux-headers g++ git
+RUN git clone https://github.com/wez/atomicparsley.git /tmp/atomicparsley
+
+RUN cd /tmp/atomicparsley \
+  && cmake . \
+  && cmake --build . --config Release
+
 FROM node:12-alpine as assets_builder
 
 # To handle 'not get uid/gid'
@@ -29,8 +39,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64
 COPY --from=ffmpeg /usr/local /usr/local
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/install-php-extensions
+COPY --from=atomicparsley_builder /tmp/atomicparsley/AtomicParsley /usr/local/bin/AtomicParsley
 
-## Common libraries required for ffmpeg to work
+## Common libraries required for ffmpeg & atomicparsley` to work
 RUN apk add --no-cache libgcc libstdc++ ca-certificates libcrypto1.1 libssl1.1 libgomp expat git
 RUN apk add --no-cache nginx sudo
 
@@ -60,15 +71,6 @@ RUN rm /usr/bin/composer /usr/bin/install-php-extensions
 
 COPY docker/nginx/site.conf /etc/nginx/conf.d/default.conf
 
-## Install AtomicParsley
-RUN curl -s https://api.github.com/repos/wez/atomicparsley/releases/latest \
-  | grep "browser_download_url.*Linux" \
-  | cut -d '"' -f 4 \
-  | xargs curl -sLo AtomicParsleyLinux.zip \
-  && unzip AtomicParsleyLinux.zip \
-  && rm AtomicParsleyLinux.zip \
-  && mv AtomicParsley /usr/local/bin/AtomicParsley
-
 EXPOSE 80
 
 ENTRYPOINT ["docker/entrypoint.sh"]
diff --git a/docker/AtomicParsley/Dockerfile b/docker/AtomicParsley/Dockerfile
new file mode 100644
index 00000000..30a26147
--- /dev/null
+++ b/docker/AtomicParsley/Dockerfile
@@ -0,0 +1,16 @@
+FROM alpine:3.12 as builder
+
+RUN apk add --no-cache make cmake linux-headers g++ git
+RUN git clone https://github.com/wez/atomicparsley.git /tmp/atomicparsley
+
+RUN cd /tmp/atomicparsley \
+  && cmake . \
+  && cmake --build . --config Release
+
+FROM alpine:3.12
+
+RUN apk add libstdc++
+
+COPY --from=builder /tmp/atomicparsley/AtomicParsley /usr/local/bin/AtomicParsley
+
+ENTRYPOINT ["/usr/local/bin/AtomicParsley"]