Merge branch 'multi'

Author: linas

opencog/atomspace-py/Dockerfile

@@ -8,6 +8,13 @@
 #
 #
 FROM opencog/atomspace:latest
+# FROM opencog/atomspace:ubuntu-20.04
+# FROM opencog/atomspace:ubuntu-22.04
+# FROM opencog/atomspace:ubuntu-24.04
+# FROM opencog/atomspace:ubuntu-25.10
+# FROM opencog/atomspace:debian-bullseye
+# FROM opencog/atomspace:debian-bookworm
+# FROM opencog/atomspace:debian-trixie
 
 # Install Debian-managed packages to get base python abilities.
 RUN apt-get -y update && apt-get -y upgrade && apt-get -y autoremove
@@ -37,7 +44,10 @@ RUN .venv/bin/pip install uv
 RUN .venv/bin/pip install requests
 
 # Model Context Protocol MCP python sdk
-RUN .venv/bin/pip install mcp
+# This SDK is not available on older OS'es, so just || true so that
+# the Docker build does not fail. Of course, its a silent failure, but
+# who cares. No one will be using it.
+RUN .venv/bin/pip install mcp || true
 
 # Opencog installed itself here; we want it available in the venv.
 ENV PYTHONPATH=/usr/local/lib/python3.12/dist-packages:$PYTHONPATH

opencog/atomspace/Dockerfile

@@ -13,6 +13,13 @@
 #
 
 FROM opencog/opencog-deps:latest
+# FROM opencog/opencog-deps:ubuntu-20.04
+# FROM opencog/opencog-deps:ubuntu-22.04
+# FROM opencog/opencog-deps:ubuntu-24.04
+# FROM opencog/opencog-deps:ubuntu-25.10
+# FROM opencog/opencog-deps:debian-bullseye
+# FROM opencog/opencog-deps:debian-bookworm
+# FROM opencog/opencog-deps:debian-trixie
 
 # The apt installs below will fail, unless we are at the latest.
 # Bump the date, if there are DNS failures!
@@ -47,7 +54,7 @@ ENV LAST_LINK_GRAMMAR_UPDATE=2024-05-02
 RUN  /tmp/octool -v -l default && ccache -C
 
 # Install core AtomSpace.
-ENV LAST_ATOMSPACE_UPDATE=2025-10-12
+ENV LAST_ATOMSPACE_UPDATE=2025-10-16
 RUN  /tmp/octool -a && ccache -C
 
 USER opencog

opencog/base/Dockerfile

@@ -5,9 +5,15 @@
 # 1. docker build --no-cache -t opencog/opencog-deps .
 # 2. docker run --rm -it opencog/opencog-deps
 
-# Ubuntu 24.04 LTS (Noble Numbat)
-ARG VERSION=24.04
-FROM ubuntu:${VERSION}
+# Default to Ubuntu 24.04 LTS (Noble Numbat)
+# ARG BASE_OS=ubuntu:20.04
+# ARG BASE_OS=ubuntu:22.04
+ARG BASE_OS=ubuntu:24.04
+# ARG BASE_OS=ubuntu:25.10
+# ARG BASE_OS=debian:bullseye   # August 2021
+# ARG BASE_OS=debian:bookworm   # June 2023
+# ARG BASE_OS=debian:trixie     # August 2025
+FROM ${BASE_OS}
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -18,8 +24,10 @@ ENV LAST_OS_UPDATE=2025-01-30
 RUN apt-get update && apt-get -y upgrade
 
 # Install apt utilities
-RUN apt-get -y install apt-transport-https software-properties-common \
-      sudo wget tzdata apt-utils
+RUN apt-get -y install apt-transport-https sudo wget tzdata apt-utils
+
+# Debian does not have software-properties-common; this is an ubuntu pkg
+RUN apt-get -y --ignore-missing install software-properties-common || true
 
 # This container is used by circle-ci unit tests, and they seem to
 # be happier when ssh is installed. Seems this is NOT installed by
@@ -29,7 +37,7 @@ RUN apt-get -y install openssh-client
 # Install ocpkg. Bump the date to get the latest ocpkg installed;
 # Otherwise, this docker build will be cached with an old octool.
 # And with old versions of those packages that octool installs.
-ENV LAST_OCPKG_UPDATE=2025-09-05
+ENV LAST_OCPKG_UPDATE=2025-10-17
 
 # The OCPKG_URL can be overridden by specifying
 # docker build --build-arg OCPKG_URL=https://some.where.else.com/ockpg

opencog/learn/Dockerfile

@@ -2,6 +2,13 @@
 # Container with core learning repos. No data.
 #
 FROM opencog/atomspace:latest
+# FROM opencog/atomspace:ubuntu-20.04
+# FROM opencog/atomspace:ubuntu-22.04
+# FROM opencog/atomspace:ubuntu-24.04
+# FROM opencog/atomspace:ubuntu-25.10
+# FROM opencog/atomspace:debian-bullseye
+# FROM opencog/atomspace:debian-bookworm
+# FROM opencog/atomspace:debian-trixie
 
 # Install everything learn-related.
 RUN  /tmp/octool -z && ccache -C