Skip to content

Commit 6719d18

Browse files
Remove IMAGE_OS setting
1 parent 06b5216 commit 6719d18

File tree

3 files changed

+15
-18
lines changed

3 files changed

+15
-18
lines changed

.github/workflows/deploy_tests.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fetch-depth: 0
1414
env:
1515
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16-
16+
1717
- uses: actions/setup-python@v4
1818
with:
1919
python-version: 3.8.x
@@ -44,7 +44,7 @@ jobs:
4444
fetch-depth: 0
4545
env:
4646
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47-
47+
4848
- name: Delete unused stuff to save space
4949
run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android
5050

@@ -58,18 +58,18 @@ jobs:
5858
examples
5959
sparse-checkout-cone-mode: false
6060
token: ${{ secrets.CONNECT_PAT }}
61-
61+
6262
- name: Build docker container-image
6363
run: |
6464
cd test/connect-rsconnect-python/test/rsconnect-python/
6565
docker compose --profile rsconnect build
66-
66+
6767
- name: Restore dist
6868
uses: actions/download-artifact@v4
6969
with:
7070
name: distributions
7171
path: dist/
72-
72+
7373
- name: Run rsconnect-python Tests
7474
env:
7575
CONNECT_LICENSE: "${{ secrets.RSC_LICENSE }}"
@@ -81,7 +81,6 @@ jobs:
8181
QUARTO_VERSION: "1.4.546"
8282
# This allows us to start Connect separately in our own docker container
8383
CONNECT_SERVER: "http://localhost:3939"
84-
IMAGE_OS: "rstudio/connect:ubuntu22"
8584
remote: "yes"
8685
run: |
8786
cd integration-testing
@@ -90,7 +89,7 @@ jobs:
9089
docker compose up -d connect-cli
9190
docker compose up -d client-cli
9291
docker compose run --rm client-cli just ../test/connect-rsconnect-python/test/rsconnect-python/_start-dev
93-
92+
9493
# Videos are captured whether the suite fails or passes
9594
- name: Save videos
9695
uses: actions/upload-artifact@v4

.github/workflows/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ jobs:
277277

278278
# This allows us to start Connect separately in our own docker container
279279
CONNECT_SERVER: "http://localhost:3939"
280-
IMAGE_OS: "rstudio/connect:ubuntu22"
281280
remote: "yes"
282281
run: |
283282
cd integration-testing

integration-testing/docker-compose.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,40 @@ services:
1111
retries: 30
1212
ports:
1313
- 9999:9999
14-
build:
14+
build:
1515
context: ./docker
1616
dockerfile: client.Dockerfile
1717
volumes:
18-
- ../:/rsconnect-python
18+
- ../:/rsconnect-python
1919
working_dir: /rsconnect-python/integration-testing
2020
entrypoint: ''
2121

2222
client-cli:
23-
build:
23+
build:
2424
context: ./docker
2525
dockerfile: cli.Dockerfile
26-
args:
26+
args:
2727
QUARTO_VERSION: ${QUARTO_VERSION}
2828
PY_VERSION: ${PY_VERSION}
2929
volumes:
30-
- ../:/rsconnect-python
30+
- ../:/rsconnect-python
3131
working_dir: /rsconnect-python/integration-testing
3232
network_mode: host
3333
entrypoint: ''
3434
environment:
3535
QUARTO_VERSION: ${QUARTO_VERSION}
3636
PY_VERSION: ${PY_VERSION}
3737
API_KEY: ${ADMIN_API_KEY}
38-
IMAGE_OS: ${IMAGE_OS}
3938

4039
# customized connect built with updated quarto version
4140
# used for nightly deploy_tests.yml that include quarto projects
4241
connect-cli:
4342
hostname: connect-cli
4443
image: rstudio/rstudio-connect:jammy
45-
build:
44+
build:
4645
context: ./docker
4746
dockerfile: connect.Dockerfile
48-
args:
47+
args:
4948
QUARTO_VERSION: ${QUARTO_VERSION}
5049
PY_VERSION: ${PY_VERSION}
5150
restart: always
@@ -60,7 +59,7 @@ services:
6059
QUARTO_VERSION: ${QUARTO_VERSION}
6160
PY_VERSION: ${PY_VERSION}
6261

63-
# connect from public docker hub
62+
# connect from public docker hub
6463
# used jupyter-notebook and deploy tests in CI, main.yml
6564
connect:
6665
hostname: connect
@@ -81,7 +80,7 @@ services:
8180
depends_on:
8281
client:
8382
condition: service_healthy
84-
build:
83+
build:
8584
context: ./docker
8685
dockerfile: cypress.Dockerfile
8786
volumes:

0 commit comments

Comments
 (0)