Merge pull request #2070 from girder/dependabot/docker/ubuntu-26.04

Bump ubuntu from 24.04 to 26.04

Author: manthey

.circleci/config.yml

@@ -164,8 +164,12 @@ jobs:
       - run:
  name: Publish the images to Docker Hub
  command: |
+            if [[ "$CIRCLE_BRANCH" =~ ^(master|girder-3|testdocker)$ ]]; then
             echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
             docker push girder/tox-and-node:latest
+            else
+            echo Skipped
+            fi
  testdocker-lts:
  machine:
  image: ubuntu-2204:current
@@ -178,8 +182,12 @@ jobs:
       - run:
  name: Publish the images to Docker Hub
  command: |
+            if [[ "$CIRCLE_BRANCH" =~ ^(master|girder-3|testdocker)$ ]]; then
             echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
             docker push girder/tox-and-node-lts:latest
+            else
+            echo Skipped
+            fi
  py310:
  machine:
  image: ubuntu-2204:current
@@ -371,6 +379,8 @@ workflows:
  # Create a branch of this name to push to docker hub
                 - testdocker
                 - girder-3
+ # build but don't push
+                - /.*docker.*/
       - testdocker-lts:
  filters:
  branches:
@@ -379,6 +389,8 @@ workflows:
  # Create a branch of this name to push to docker hub
                 - testdocker
                 - girder-3
+ # build but don't push
+                - /.*docker.*/
       - py310:
  filters:
  tags:

test.Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:24.04
+FROM ubuntu:26.04
 
 # This is mostly based on the Dockerfiles from themattrix/pyenv and
 # themattrix/tox-base.  It has some added packages, most notably liblzma-dev,
@@ -68,9 +68,9 @@ RUN apt-get update && \
       dnsutils \
       universal-ctags \
       && \
- localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
- find /usr/share/locale -mindepth 1 -maxdepth 1 ! -name 'en_US*' ! -name 'C' ! -name 'en' -type d -exec rm -rf {} + && \
- find /usr/share/i18n -mindepth 1 ! -name 'en_US*' ! -name 'C' -type f -exec rm -f {} + && \
+    locale-gen en_US.UTF-8 && \
+ apt-get remove -y locales && \
+ rm -rf /usr/bin/pebble && \
     curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash && \
     find / -xdev -name __pycache__ -type d -exec rm -r {} \+ && \
     rm -rf /etc/ssh/ssh_host* && \