client: Dockerfiles: refactor for build options

client/Dockerfiles/finance/Dockerfile.archlinux.in

@@ -19,88 +19,69 @@
 FROM archlinux:base-devel
 
 #
-# System
+# System preparation
 #
 
-# `finance` user
+# Add `finance` user
 RUN useradd -m -s /bin/bash @DOCKER_FINANCE_USER@ -u @DOCKER_FINANCE_UID@
 
-# System-level user for building (won't pollute user-level UID space)
+# Add system-level user for building (won't pollute user-level UID space)
 RUN useradd -m -s /bin/bash -r builder
+RUN gpasswd -a builder wheel
+
+# Prepare for non-package dependencies
+RUN chown root:wheel /usr/local/* && chmod g+rwx /usr/local/*
 
 #
-# Dependencies
+# Package dependencies
 #
 
-# Minimum requirements
 RUN pacman -Syu \
-  bc \
-  composer \
-  ghc \
   git \
   hledger \
   hledger-iadd \
   hledger-ui \
   hledger-web \
   python-pipx \
-  stack \
   vim \
   visidata \
   xsv \
   --noconfirm --disable-download-timeout
 
-# ROOT.cern (and docker-finance requirements)
-RUN pacman -Syu \
-  benchmark \
-  botan2 \
-  crypto++ \
-  gtest \
-  libsodium \
-  root \
-  --noconfirm --disable-download-timeout
-
-# PHP mandatory requirements
-RUN sed -i \
-  -e 's:^;extension=bcmath:extension=bcmath:' \
-  -e 's:^;extension=gmp:extension=gmp:' \
-  -e 's:^;extension=iconv:extension=iconv:' \
-  /etc/php/php.ini
-
-# Give access to builder
-RUN gpasswd -a builder wheel
-RUN chown root:wheel /usr/local/* && chmod g+rwx /usr/local/*
-
-# hledger-flow
-# TODO: upstream-integrate with hledger? packaged somewhere? would like to not have to clone and build here...
-USER builder
-WORKDIR /usr/local/src
-RUN git clone --depth=1 https://github.com/apauley/hledger-flow -b v0.15.0
-WORKDIR /usr/local/src/hledger-flow
-RUN stack setup
-RUN stack build
-RUN stack test --interleaved-output --pedantic
-RUN stack install --local-bin-path=/usr/local/bin
-
-# Fetch APIs
-WORKDIR /usr/local/lib/php
-# NOTE: Coinbase Pro has been "sunsetted"
-#RUN composer require mocking-magician/coinbase-pro-sdk
-RUN composer require ozdemirburak/json-csv
-RUN composer require ccxt/ccxt
-USER root
-RUN sed -i \
-  -e 's:^;extension=bcmath:extension=bcmath:' \
-  -e 's:^;extension=gmp:extension=gmp:' \
-  -e 's:^;extension=iconv:extension=iconv:' \
-  /etc/php/php.ini
-
-# Minimum requirements (python)
 USER @DOCKER_FINANCE_USER@
 WORKDIR /home/@DOCKER_FINANCE_USER@
 RUN pipx install shyaml
 RUN pipx install csvkit
 
+#
+# `fetch` APIs
+#
+
+USER root
+
+RUN pacman -Syu \
+  bc \
+  composer \
+  --noconfirm --disable-download-timeout
+
+RUN sed -i \
+  -e 's:^;extension=bcmath:extension=bcmath:' \
+  -e 's:^;extension=gmp:extension=gmp:' \
+  -e 's:^;extension=iconv:extension=iconv:' \
+  /etc/php/php.ini
+
+USER builder
+WORKDIR /usr/local/lib/php
+# NOTE: Coinbase Pro has been "sunsetted"
+#RUN composer require mocking-magician/coinbase-pro-sdk
+RUN composer require ozdemirburak/json-csv
+RUN composer require ccxt/ccxt
+
+#
 # Superscript
+#
+
+USER @DOCKER_FINANCE_USER@
 RUN echo "source \"\${DOCKER_FINANCE_CONTAINER_CONF}/shell/superscript.bash\"" | tee -a ~/.bashrc
 
 #