Skip to content

Commit

Permalink
Rename Docker images (cvat-ai#12)
Browse files Browse the repository at this point in the history
  • Loading branch information
sizov-kirill authored Jul 20, 2022
1 parent 82634d1 commit 3d3903c
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 25 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ jobs:
- name: Pull CVAT images
run: |
docker pull ${{ steps.meta-server.outputs.tags }}
docker tag ${{ steps.meta-server.outputs.tags }} openvino/cvat_server
docker tag ${{ steps.meta-server.outputs.tags }} cvat/server
docker pull ${{ steps.meta-ui.outputs.tags }}
docker tag ${{ steps.meta-ui.outputs.tags }} openvino/cvat_ui
docker tag ${{ steps.meta-ui.outputs.tags }} cvat/ui
- name: Running OPA tests
run: |
Expand Down Expand Up @@ -282,10 +282,10 @@ jobs:
- name: Pull CVAT images
run: |
docker pull ${{ steps.meta-server.outputs.tags }}
docker tag ${{ steps.meta-server.outputs.tags }} openvino/cvat_server
docker tag ${{ steps.meta-server.outputs.tags }} cvat/server
docker pull ${{ steps.meta-ui.outputs.tags }}
docker tag ${{ steps.meta-ui.outputs.tags }} openvino/cvat_ui
docker tag ${{ steps.meta-ui.outputs.tags }} cvat/ui
- name: Run CVAT instance
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ jobs:
- name: Pull CVAT images
run: |
docker pull ${{ steps.meta-server.outputs.tags }}
docker tag ${{ steps.meta-server.outputs.tags }} openvino/cvat_server
docker tag ${{ steps.meta-server.outputs.tags }} cvat/server
docker pull ${{ steps.meta-ui.outputs.tags }}
docker tag ${{ steps.meta-ui.outputs.tags }} openvino/cvat_ui
docker tag ${{ steps.meta-ui.outputs.tags }} cvat/ui
- name: Running OPA tests
run: |
Expand Down Expand Up @@ -227,10 +227,10 @@ jobs:
- name: Pull CVAT images
run: |
docker pull ${{ steps.meta-server.outputs.tags }}
docker tag ${{ steps.meta-server.outputs.tags }} openvino/cvat_server
docker tag ${{ steps.meta-server.outputs.tags }} cvat/server
docker pull ${{ steps.meta-ui.outputs.tags }}
docker tag ${{ steps.meta-ui.outputs.tags }} openvino/cvat_ui
docker tag ${{ steps.meta-ui.outputs.tags }} cvat/ui
- uses: actions/setup-node@v2
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ jobs:
context: .
file: ./Dockerfile.ui
cache-from: type=local,src=/tmp/cvat_cache_ui
tags: openvino/cvat_ui:latest
tags: cvat/ui:latest
load: true

- name: Building CVAT Logstash image
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
- name: Pull CVAT server image
run: |
docker pull ${{ steps.meta-server.outputs.tags }}
docker tag ${{ steps.meta-server.outputs.tags }} openvino/cvat_server
docker tag ${{ steps.meta-server.outputs.tags }} cvat/server
- name: OPA tests
run: |
Expand Down Expand Up @@ -291,10 +291,10 @@ jobs:
- name: Pull CVAT UI image
run: |
docker pull ${{ steps.meta-server.outputs.tags }}
docker tag ${{ steps.meta-server.outputs.tags }} openvino/cvat_server
docker tag ${{ steps.meta-server.outputs.tags }} cvat/server
docker pull ${{ steps.meta-ui.outputs.tags }}
docker tag ${{ steps.meta-ui.outputs.tags }} openvino/cvat_ui
docker tag ${{ steps.meta-ui.outputs.tags }} cvat/ui
- name: Run CVAT instance
run: |
Expand Down Expand Up @@ -416,7 +416,7 @@ jobs:
- name: Pull CVAT server image
run: |
docker pull ${{ steps.meta-server.outputs.tags }}
docker tag ${{ steps.meta-server.outputs.tags }} openvino/cvat_server
docker tag ${{ steps.meta-server.outputs.tags }} cvat/server
- name: Downloading coverage results
uses: actions/download-artifact@v2
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openvino/cvat_server
FROM cvat/server

ENV DJANGO_CONFIGURATION=testing
USER root
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ Limitations:

Prebuilt docker images for CVAT releases are available on Docker Hub:

- [cvat_server](https://hub.docker.com/r/openvino/cvat_server)
- [cvat_ui](https://hub.docker.com/r/openvino/cvat_ui)
- [cvat_server](https://hub.docker.com/r/cvat/server)
- [cvat_ui](https://hub.docker.com/r/cvat/ui)

## REST API
The current REST API version is `2.0-alpha`. We focus on its improvement and therefore
Expand Down
2 changes: 1 addition & 1 deletion components/analytics/docker-compose.analytics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:

cvat_kibana_setup:
container_name: cvat_kibana_setup
image: openvino/cvat_server
image: cvat/server
volumes: ['./components/analytics/kibana:/home/django/kibana:ro']
depends_on: ['cvat']
working_dir: '/home/django'
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:

cvat:
container_name: cvat
image: openvino/cvat_server
image: cvat/server
restart: always
depends_on:
- cvat_redis
Expand Down Expand Up @@ -57,7 +57,7 @@ services:

cvat_ui:
container_name: cvat_ui
image: openvino/cvat_ui
image: cvat/ui
restart: always
depends_on:
- cvat
Expand Down
4 changes: 2 additions & 2 deletions helm-chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fullnameOverride: ""
cvat:
backend:
replicas: 1
image: openvino/cvat_server
image: cvat/server
tag: latest
permissionFix:
enabled: true
Expand Down Expand Up @@ -59,7 +59,7 @@ cvat:
size: 20Gi
frontend:
replicas: 1
image: openvino/cvat_ui
image: cvat/ui
tag: latest
labels: {}
# test: test
Expand Down
8 changes: 4 additions & 4 deletions site/content/en/docs/manual/advanced/dataset_manifest.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ optional arguments:
Directory where the manifest file will be saved
```
### Alternative way to use with openvino/cvat_server
### Alternative way to use with cvat/server
```bash
docker run -it --entrypoint python3 -v /path/to/host/data/:/path/inside/container/:rw openvino/cvat_server
docker run -it --entrypoint python3 -v /path/to/host/data/:/path/inside/container/:rw cvat/server
utils/dataset_manifest/create.py --output-dir /path/to/manifest/directory/ /path/to/data/
```
Expand Down Expand Up @@ -90,10 +90,10 @@ Create a dataset manifest with pattern (may be used `*`, `?`, `[]`):
python create.py --output-dir ~/Documents "/home/${USER}/Documents/**/image*.jpeg"
```
Create a dataset manifest with `openvino/cvat_server`:
Create a dataset manifest with `cvat/server`:
```bash
docker run -it --entrypoint python3 -v ~/Documents/data/:${HOME}/manifest/:rw openvino/cvat_server
docker run -it --entrypoint python3 -v ~/Documents/data/:${HOME}/manifest/:rw cvat/server
utils/dataset_manifest/create.py --output-dir ~/manifest/ ~/manifest/images/
```
Expand Down

0 comments on commit 3d3903c

Please sign in to comment.