From b7900f1eefa6678fd4fd07aa14647d981b044819 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Sat, 13 Jul 2024 23:35:09 -0700 Subject: [PATCH] client: reorg/factoring for 'experimental' builds - Dockerfiles: separation of concerns for build types - Dockerfiles: pull from respective hledger-based branches/tags - Dockerfiles: move hledger-based test building into experimental - docker-finance.yaml: add commented package 'unuran' (experimental) --- .../archlinux/Dockerfile.hledger-flow.src.in | 1 - .../Dockerfile.hledger-flow.src.in | 40 ++++++++++ .../Dockerfile.hledger.src.in | 2 +- .../archlinux/experimental/Dockerfile.root.in | 43 +++++++++++ .../ubuntu/Dockerfile.hledger-flow.src.in | 1 - .../Dockerfile.hledger-flow.src.in | 39 ++++++++++ .../Dockerfile.hledger.src.in | 2 +- .../ubuntu/experimental/Dockerfile.root.in | 75 +++++++++++++++++++ client/docker-finance.yaml | 4 + 9 files changed, 203 insertions(+), 4 deletions(-) create mode 100644 client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger-flow.src.in rename client/Dockerfiles/finance/archlinux/{ => experimental}/Dockerfile.hledger.src.in (94%) create mode 100644 client/Dockerfiles/finance/archlinux/experimental/Dockerfile.root.in create mode 100644 client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.hledger-flow.src.in rename client/Dockerfiles/finance/ubuntu/{ => experimental}/Dockerfile.hledger.src.in (94%) create mode 100644 client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.root.in diff --git a/client/Dockerfiles/finance/archlinux/Dockerfile.hledger-flow.src.in b/client/Dockerfiles/finance/archlinux/Dockerfile.hledger-flow.src.in index 6f988e8..871257d 100644 --- a/client/Dockerfiles/finance/archlinux/Dockerfile.hledger-flow.src.in +++ b/client/Dockerfiles/finance/archlinux/Dockerfile.hledger-flow.src.in @@ -35,7 +35,6 @@ 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 # vim: sw=2 sts=2 si ai et diff --git a/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger-flow.src.in b/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger-flow.src.in new file mode 100644 index 0000000..48a586b --- /dev/null +++ b/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger-flow.src.in @@ -0,0 +1,40 @@ +# docker-finance | modern accounting for the power-user +# +# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# +# hledger-flow (source) +# + +USER root + +RUN pacman -Syu \ + ghc \ + stack \ + --noconfirm --disable-download-timeout + +USER builder + +WORKDIR /usr/local/src +RUN git clone https://github.com/apauley/hledger-flow -b master + +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 + +# vim: sw=2 sts=2 si ai et diff --git a/client/Dockerfiles/finance/archlinux/Dockerfile.hledger.src.in b/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger.src.in similarity index 94% rename from client/Dockerfiles/finance/archlinux/Dockerfile.hledger.src.in rename to client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger.src.in index e69ddd5..9b592f4 100644 --- a/client/Dockerfiles/finance/archlinux/Dockerfile.hledger.src.in +++ b/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.hledger.src.in @@ -35,7 +35,7 @@ RUN pacman -Rsc \ USER builder WORKDIR /usr/local/src -RUN git clone --depth=1 https://github.com/simonmichael/hledger +RUN git clone https://github.com/simonmichael/hledger -b master WORKDIR /usr/local/src/hledger RUN stack update diff --git a/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.root.in b/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.root.in new file mode 100644 index 0000000..faaac1e --- /dev/null +++ b/client/Dockerfiles/finance/archlinux/experimental/Dockerfile.root.in @@ -0,0 +1,43 @@ +# docker-finance | modern accounting for the power-user +# +# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# +# ROOT.cern (and docker-finance requirements) +# + +USER root + +# ROOT.cern +RUN pacman -Syu \ + root \ + --noconfirm --disable-download-timeout + +# docker-finance +RUN pacman -Syu \ + benchmark \ + botan2 \ + crypto++ \ + gtest \ + libsodium \ + --noconfirm --disable-download-timeout + +# docker-finance (experimental / testing) +RUN pacman -Syu \ + unuran \ + --noconfirm --disable-download-timeout + +# vim: sw=2 sts=2 si ai et diff --git a/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.src.in b/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.src.in index 282f657..8145cc1 100644 --- a/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.src.in +++ b/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger-flow.src.in @@ -34,7 +34,6 @@ 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 # vim: sw=2 sts=2 si ai et diff --git a/client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.hledger-flow.src.in b/client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.hledger-flow.src.in new file mode 100644 index 0000000..008fdad --- /dev/null +++ b/client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.hledger-flow.src.in @@ -0,0 +1,39 @@ +# docker-finance | modern accounting for the power-user +# +# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# +# hledger-flow (source) +# + +USER root + +RUN apt-get install -y \ + ghc \ + haskell-stack + +USER builder + +WORKDIR /usr/local/src +RUN git clone https://github.com/apauley/hledger-flow -b master + +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 + +# vim: sw=2 sts=2 si ai et diff --git a/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger.src.in b/client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.hledger.src.in similarity index 94% rename from client/Dockerfiles/finance/ubuntu/Dockerfile.hledger.src.in rename to client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.hledger.src.in index cc6fdb5..499ba3f 100644 --- a/client/Dockerfiles/finance/ubuntu/Dockerfile.hledger.src.in +++ b/client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.hledger.src.in @@ -32,7 +32,7 @@ RUN apt-get install -y \ USER builder WORKDIR /usr/local/src -RUN git clone --depth=1 https://github.com/simonmichael/hledger +RUN git clone https://github.com/simonmichael/hledger -b master WORKDIR /usr/local/src/hledger RUN stack update diff --git a/client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.root.in b/client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.root.in new file mode 100644 index 0000000..297fa15 --- /dev/null +++ b/client/Dockerfiles/finance/ubuntu/experimental/Dockerfile.root.in @@ -0,0 +1,75 @@ +# docker-finance | modern accounting for the power-user +# +# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# +# ROOT.cern (and docker-finance requirements) +# + +USER root + +# ROOT.cern dependencies (regardless of building or not) +RUN apt-get install -y \ + binutils \ + cmake \ + dpkg-dev \ + g++ \ + gcc \ + libssl-dev \ + libtbb-dev \ + libx11-dev \ + libxext-dev \ + libxft-dev \ + libxpm-dev \ + python3 + +# ROOT.cern pre-compiled installation +RUN apt-get install -y curl +USER builder +WORKDIR /usr/local/src +RUN curl --location -O "https://root.cern/download/root_v6.32.02.Linux-ubuntu24.04-x86_64-gcc13.2.tar.gz" +RUN tar xvzf "root_v6.32.02.Linux-ubuntu24.04-x86_64-gcc13.2.tar.gz" + +# ROOT.cern environment +# +# bash_aliases notes: +# +# - *MUST* source thisroot.sh (from any directory) +# +# - For `docker-finance version` command: +# +# - To avoid thisroot.sh error, pushd/popd is required (per thisroot.sh) +# +# - Although $ROOTSYS will be available during normal operation, it won't +# be avaialble to `docker-finance version`- so add binary to PATH here. +USER @DOCKER_FINANCE_USER@ +RUN echo "pushd /usr/local/src/root/bin 1>/dev/null && source \"/usr/local/src/root/bin/thisroot.sh\" && popd 1>/dev/null" | tee -a ~/.bash_aliases +RUN echo "export PATH=\"\$PATH::/usr/local/src/root/bin\"" | tee -a ~/.bash_aliases + +# docker-finance +USER root +RUN apt-get install -y \ + googletest \ + libbenchmark-dev \ + libbotan-2-dev \ + libcrypto++-dev \ + libsodium-dev + +# docker-finance (experimental / testing) +RUN apt-get install -y \ + libunuran-dev + +# vim: sw=2 sts=2 si ai et diff --git a/client/docker-finance.yaml b/client/docker-finance.yaml index 411e2de..ce7c7c9 100644 --- a/client/docker-finance.yaml +++ b/client/docker-finance.yaml @@ -48,6 +48,8 @@ container: - "vim" - "visidata" - "xsv" + # For experimental build + #- "unuran" commands: - "csvstat --version" - "hledger-flow --version" @@ -90,6 +92,8 @@ container: - "vim" - "visidata" - "zlib1g-dev" + # For experimental build + #- "libunuran-dev" commands: - "xsv --version" - "csvstat --version"