Remove IMAGE_OS setting

posit-dev · Feb 18, 2025 · 6719d18 · 6719d18
1 parent 06b5216
commit 6719d18
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/.github/workflows/deploy_tests.yml b/.github/workflows/deploy_tests.yml
@@ -13,7 +13,7 @@ jobs:
             fetch-depth: 0
           env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            
+
         - uses: actions/setup-python@v4
           with:
             python-version: 3.8.x
@@ -44,7 +44,7 @@ jobs:
             fetch-depth: 0
           env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        
+
         - name: Delete unused stuff to save space
           run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android
 
@@ -58,18 +58,18 @@ jobs:
                 examples
             sparse-checkout-cone-mode: false
             token: ${{ secrets.CONNECT_PAT }}
-    
+
         - name: Build docker container-image
           run: |
             cd test/connect-rsconnect-python/test/rsconnect-python/
             docker compose --profile rsconnect build
-    
+
         - name: Restore dist
           uses: actions/download-artifact@v4
           with:
             name: distributions
             path: dist/
-       
+
         - name: Run rsconnect-python Tests
           env:
             CONNECT_LICENSE: "${{ secrets.RSC_LICENSE }}"
@@ -81,7 +81,6 @@ jobs:
             QUARTO_VERSION: "1.4.546"
             # This allows us to start Connect separately in our own docker container
             CONNECT_SERVER: "http://localhost:3939"
-            IMAGE_OS: "rstudio/connect:ubuntu22"
             remote: "yes"
           run: |
             cd integration-testing
@@ -90,7 +89,7 @@ jobs:
             docker compose up -d connect-cli
             docker compose up -d client-cli
             docker compose run --rm client-cli just ../test/connect-rsconnect-python/test/rsconnect-python/_start-dev
-        
+
         # Videos are captured whether the suite fails or passes
         - name: Save videos
           uses: actions/upload-artifact@v4

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -277,7 +277,6 @@ jobs:
 
               # This allows us to start Connect separately in our own docker container
               CONNECT_SERVER: "http://localhost:3939"
-              IMAGE_OS: "rstudio/connect:ubuntu22"
               remote: "yes"
             run: |
               cd integration-testing

diff --git a/integration-testing/docker-compose.yml b/integration-testing/docker-compose.yml
@@ -11,41 +11,40 @@ services:
       retries: 30
     ports:
       - 9999:9999
-    build: 
+    build:
       context: ./docker
       dockerfile: client.Dockerfile
     volumes:
-      - ../:/rsconnect-python 
+      - ../:/rsconnect-python
     working_dir: /rsconnect-python/integration-testing
     entrypoint: ''
 
   client-cli:
-    build: 
+    build:
       context: ./docker
       dockerfile: cli.Dockerfile
-      args: 
+      args:
         QUARTO_VERSION: ${QUARTO_VERSION}
         PY_VERSION: ${PY_VERSION}
     volumes:
-      - ../:/rsconnect-python 
+      - ../:/rsconnect-python
     working_dir: /rsconnect-python/integration-testing
     network_mode: host
     entrypoint: ''
     environment:
       QUARTO_VERSION: ${QUARTO_VERSION}
       PY_VERSION: ${PY_VERSION}
       API_KEY: ${ADMIN_API_KEY}
-      IMAGE_OS: ${IMAGE_OS}
 
   # customized connect built with updated quarto version
   # used for nightly deploy_tests.yml that include quarto projects
   connect-cli:
     hostname: connect-cli
     image: rstudio/rstudio-connect:jammy
-    build: 
+    build:
       context: ./docker
       dockerfile: connect.Dockerfile
-      args: 
+      args:
         QUARTO_VERSION: ${QUARTO_VERSION}
         PY_VERSION: ${PY_VERSION}
     restart: always
@@ -60,7 +59,7 @@ services:
       QUARTO_VERSION: ${QUARTO_VERSION}
       PY_VERSION: ${PY_VERSION}
 
-  # connect from public docker hub 
+  # connect from public docker hub
   # used jupyter-notebook and deploy tests in  CI, main.yml
   connect:
     hostname: connect
@@ -81,7 +80,7 @@ services:
     depends_on:
       client:
         condition: service_healthy
-    build: 
+    build:
       context: ./docker
       dockerfile: cypress.Dockerfile
     volumes: