Merge branch 'release/1.3.3'

.github/workflows/build.yaml

@@ -10,6 +10,8 @@ on:
 
 env:
   REGISTRY: ghcr.io
+  BASE_REPO: ubuntu
+  BASE_TAG: "22.04"
 
 jobs:
 
@@ -79,8 +81,8 @@ jobs:
           file: ${{ matrix.build }}/Dockerfile
           push: ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags/') }}
           build-args: |
-            img_repo=python
-            img_tag=bullseye
+            img_repo=${{ env.BASE_REPO }}
+            img_tag=${{ env.BASE_TAG }}
             common_tag=${{ steps.tag_name.outputs.tag }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           platforms: linux/amd64

Dev/Dockerfile

@@ -1,5 +1,5 @@
-ARG img_repo=python
-ARG img_tag=bullseye
+ARG img_repo=ubuntu
+ARG img_tag=22.04
 
 FROM ${img_repo}:${img_tag} as base_image
 

Documentation/ValidationLog.rst

@@ -43,6 +43,19 @@ Fixes:
 Log
 ---
 
+Version: 1.3.3
+~~~~~~~~~~~~~~~
+
+Release Date: Feb 23, 2023
+'''''''''''''''''''''''''''''''
+
+New Features:
+'''''''''''''
+
+* Ubuntu base image
+* Dev/Prod split (v1.3.0)
+
+
 Version: 1.2.0
 ~~~~~~~~~~~~~~~
 

Prod/Dockerfile

@@ -1,5 +1,5 @@
-ARG img_repo=python
-ARG img_tag=bullseye
+ARG img_repo=ubuntu
+ARG img_tag=22.04
 
 FROM ${img_repo}:${img_tag} as base_image
 
@@ -38,6 +38,7 @@ RUN ${scripts_dir}/install_packages.sh prod &&\
     ${scripts_dir}/install_other_packages.sh &&\
     apt-get purge -y \
         wget \
+        pipenv \
         libhdf5-dev \
         &&\
     ${scripts_dir}/create_common_setup.sh &&\

README.md

@@ -4,7 +4,7 @@ This repo includes the Dockerfiles for the base images of the Project 8 analysis
 
 The Dev image includes packages that are needed to build the Project 8 software (usually ending in `-dev`).  The Prod image includes non-dev packages that are necessary to run Project 8 software.  The Prod image is about a factor of two smaller than the Dev image when built.
 
-These images are based on the `python/bullseye (Debian-based) image.
+These images are based on the Ubuntu 22.04 image.
 
 Dockerfiles for individual software packages can be found in their respective repositories.  They are all based on the `luna_base` image.
 
@@ -13,6 +13,7 @@ Dockerfiles for individual software packages can be found in their respective re
 Installed by aptitude for Dev/Prod (and what requires it):
 * build-essential / build-essential (many things)
 * dpkg-dev / [none] (many things)
+* python3 / python3.10-minimal (many things)
 * cmake / [none] (any dev work)
 * git / [none] (any dev work)
 * vim / [none] (any dev work)
@@ -30,6 +31,7 @@ Installed by aptitude for Dev/Prod (and what requires it):
 * libjpeg-dev / libjpeg62-turbo (ROOT)
 * libfftw3-dev / libfftw3-double3 (Katydid, Locust, ROOT, ...)
 * libboost-all-dev / [none] (many things)
+* [none] / libboost-atomic1.74.0 (many things)
 * [none] / libboost-date-time1.74.0 (many things)
 * [none] / libboost-filesystem1.74.0 (many things)
 * [none] / libboost-program-options1.74.0 (Katydid)

Scripts/install_other_packages.sh

@@ -11,7 +11,7 @@
 #
 
 # List files to be downloaded/used
-ROOT_TARBALL="root_v6.22.06.Linux-ubuntu20-x86_64-gcc9.3.tar.gz"
+ROOT_TARBALL="root_v6.26.10.Linux-ubuntu22-x86_64-gcc11.3.tar.gz"
 
 cd /usr/local
 

Scripts/install_packages.sh

@@ -13,6 +13,7 @@
 # Current dependencies installed
 #   - build-essential: anything to be built; standard libraries
 #   - dpkg-dev: ???
+#   - python3.10-minimal: anything using Python
 #   - cmake: anything to be built
 #   - clang: anything to be built with clang
 #   - git: any p8 projects to be built
@@ -31,6 +32,7 @@
 #   - libpng(-dev): ROOT
 #   - libjpeg(-dev): ROOT
 #   - libfftw3(-dev): ROOT, Katydid, Locust
+#   - libboost-atomic: Katydid, Locust
 #   - libboost-date-time: Katydid, Locust
 #   - libboost-filesystem: Katydid, Locust
 #   - libboost-program-options: Katydid
@@ -51,10 +53,13 @@ if [[ "$1" = "dev" ]]; then
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         build-essential \
         dpkg-dev \
+        wget \
         cmake \
         clang \
         openssl \
         vim \
+        python3 \
+        pipenv \
         libgsl-dev \
         libopenblas-dev \
         liblapack-dev \
@@ -75,29 +80,32 @@ if [[ "$1" = "dev" ]]; then
         rapidjson-dev \
         pybind11-dev
 elif [[ "$1" = "prod" ]]; then
-    DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         build-essential \
         wget \
-        libgsl25 \
+        python3.10-minimal \
+        pipenv \
+        libgsl27 \
         libx11-6 \
         libxpm4 \
         libxft2 \
         libxext6 \
         libpng16-16 \
-        libjpeg62-turbo \
-        libssl1.1 \
+        libjpeg9 \
+        libssl3 \
         libfftw3-double3 \
         libboost-date-time1.74.0 \
         libboost-filesystem1.74.0 \
         libboost-program-options1.74.0 \
         libboost-system1.74.0 \
         libboost-thread1.74.0 \
+        libboost-atomic1.74.0 \
         libeigen3-dev \
         libhdf5-cpp-103 \
         libhdf5-dev \
         libmatio11 \
-        libvtk9 \
-        libyaml-cpp0.6 \
+        libvtk9.1 \
+        libyaml-cpp0.7 \
         rapidjson-dev
 else
     exit 1