Skip to content

use docker compose rather than docker-compose #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2024
Merged

use docker compose rather than docker-compose #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Build docker container-image
run: |
cd test/connect-rsconnect-python/test/rsconnect-python/
docker-compose --profile rsconnect build
docker compose --profile rsconnect build

- name: Restore dist
uses: actions/download-artifact@v3
Expand All @@ -85,7 +85,7 @@ jobs:
docker compose build client-cli
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
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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,15 +185,15 @@ jobs:
python -m pip install '.[test]'
- name: Run RStudio Connect
run: |
docker-compose up --build -d
docker compose up --build -d
pip freeze > requirements.txt
make dev
env:
RSC_LICENSE: ${{ secrets.RSC_LICENSE }}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: Get logs in case of failure
run: |
docker-compose logs rsconnect
docker compose logs rsconnect
if: ${{ failure() }}

# NOTE: edited to run checks for python package
Expand Down Expand Up @@ -282,7 +282,7 @@ jobs:
- name: Build docker container-image
run: |
cd test/connect-rsconnect-python/test/rsconnect-python/
docker-compose --profile rsconnect build
docker compose --profile rsconnect build

- name: Restore dist
uses: actions/download-artifact@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,15 @@ jobs:
python -m pip install -r vetiver-testing/vetiver-requirements.txt
- name: Run RStudio Connect
run: |
docker-compose up --build -d
docker compose up --build -d
pip freeze > requirements.txt
make dev
env:
RSC_LICENSE: ${{ secrets.RSC_LICENSE }}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: Get logs in case of failure
run: |
docker-compose logs rsconnect
docker compose logs rsconnect
if: ${{ failure() }}

# NOTE: edited to run checks for python package
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ promote-docs-in-s3:
RSC_API_KEYS=vetiver-testing/rsconnect_api_keys.json

dev:
docker-compose up -d
docker-compose exec -T rsconnect bash < vetiver-testing/setup-rsconnect/add-users.sh
docker compose up -d
docker compose exec -T rsconnect bash < vetiver-testing/setup-rsconnect/add-users.sh
python vetiver-testing/setup-rsconnect/dump_api_keys.py $(RSC_API_KEYS)

dev-stop:
docker-compose down
docker compose down
rm -f $(RSC_API_KEYS)
8 changes: 4 additions & 4 deletions tests/test_main_system_caches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
CONNECT_SERVER = "http://localhost:3939"
CONNECT_KEYS_JSON = "vetiver-testing/rsconnect_api_keys.json"

ADD_CACHE_COMMAND = "docker-compose exec -u rstudio-connect -T rsconnect mkdir -p /data/python-environments/pip/1.2.3"
RM_CACHE_COMMAND = "docker-compose exec -u rstudio-connect -T rsconnect rm -Rf /data/python-environments/pip/1.2.3"
ADD_CACHE_COMMAND = "docker compose exec -u rstudio-connect -T rsconnect mkdir -p /data/python-environments/pip/1.2.3"
RM_CACHE_COMMAND = "docker compose exec -u rstudio-connect -T rsconnect rm -Rf /data/python-environments/pip/1.2.3"
# The following returns int(0) if dir exists, else int(256).
CACHE_EXISTS_COMMAND = "docker-compose exec -u rstudio-connect -T rsconnect [ -d /data/python-environments/pip/1.2.3 ]"
SERVICE_RUNNING_COMMAND = "docker-compose ps --services --filter 'status=running' | grep rsconnect"
CACHE_EXISTS_COMMAND = "docker compose exec -u rstudio-connect -T rsconnect [ -d /data/python-environments/pip/1.2.3 ]"
SERVICE_RUNNING_COMMAND = "docker compose ps --services --filter 'status=running' | grep rsconnect"


def rsconnect_service_running():
Expand Down