Merge pull request #319 from DigitalSlideArchive/update-ci-images

Update CI machine images
DigitalSlideArchive · Feb 15, 2024 · f9fac33 · f9fac33
2 parents 5628a5e + bc2b625
commit f9fac33
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,7 +9,7 @@ commands:
           command: pip3 install -U pip
       - run:
           name: Install dependencies
-          command: pip3 install requests docker
+          command: pip3 install requests docker setuptools
       - attach_workspace:
           at: /tmp/workspace
       - run:
@@ -53,15 +53,15 @@ jobs:
   build:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - run:
           name: Upgrade pip
           command: pip3 install -U pip
       - run:
           name: Install dependencies
-          command: pip3 install ansible requests docker six 'urllib3<2'
+          command: pip3 install ansible requests docker six 'urllib3<2' setuptools
       - run:
           name: Build the dockers
           command: export TERM=xterm && python3 ansible/deploy_docker.py build
@@ -82,7 +82,7 @@ jobs:
   test-cli:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - usedockers
@@ -103,7 +103,7 @@ jobs:
   test-cli-common:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - usecommondocker
@@ -115,7 +115,7 @@ jobs:
     # This tests injecting a custom config file and proxy path locations
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - usedockers
@@ -163,7 +163,7 @@ jobs:
   test-proxy-common:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - usecommondocker
@@ -201,7 +201,7 @@ jobs:
   test-girder-build:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - usedockers
@@ -227,7 +227,7 @@ jobs:
   test-girder-build-common:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - usecommondocker
@@ -238,7 +238,7 @@ jobs:
   test-histomicsui:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - usedockers
@@ -250,7 +250,7 @@ jobs:
   test-histomicsui-common:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - usecommondocker
@@ -262,14 +262,14 @@ jobs:
   docker-compose:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - run:
-          name: Use Python 3.11
+          name: Use Python 3.12
           command: |
             pyenv versions
-            pyenv global 3.11
+            pyenv global 3.12
             pip --version
       - run:
           name: Check provisioning defaults match
@@ -298,7 +298,7 @@ jobs:
           command: pip install -U pip requests 'urllib3<2'
       - run:
           name: Install modules needed for testing
-          command: pip install girder-client six
+          command: pip install girder-client six setuptools
       - run:
           name: Wait for girder to respond and be configured
           command: |
@@ -314,14 +314,14 @@ jobs:
   docker-compose-minimal:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - run:
-          name: Use Python 3.11
+          name: Use Python 3.12
           command: |
             pyenv versions
-            pyenv global 3.11
+            pyenv global 3.12
             pip --version
       - run:
           name: Run docker-compose up
@@ -334,14 +334,14 @@ jobs:
   docker-compose-external-worker:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - run:
-          name: Use Python 3.11
+          name: Use Python 3.12
           command: |
             pyenv versions
-            pyenv global 3.11
+            pyenv global 3.12
             pip --version
       - run:
           name: Run docker-compose up
@@ -356,14 +356,14 @@ jobs:
   docker-compose-with-dive-volview:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - run:
-          name: Use Python 3.11
+          name: Use Python 3.12
           command: |
             pyenv versions
-            pyenv global 3.11
+            pyenv global 3.12
             pip --version
       - run:
           name: Run docker-compose up
@@ -376,7 +376,7 @@ jobs:
   publish-docker:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - usedockers
@@ -395,7 +395,7 @@ jobs:
   publish-docker-common:
     working_directory: ~/project
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: ubuntu-2204:current
     steps:
       - checkout
       - usecommondocker

diff --git a/Dockerfile b/Dockerfile
@@ -45,7 +45,7 @@ RUN curl -LJ https://github.com/krallin/tini/releases/download/v0.19.0/tini -o /
     chmod +x /usr/bin/tini
 
 # Make a virtualenv with our preferred python
-RUN virtualenv --python 3.9 /opt/venv
+RUN virtualenv --python 3.11 /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 
 # Make sure core packages are up to date