diff --git a/.github/workflows/full.yml b/.github/workflows/full.yml index c216a363..ad00a129 100644 --- a/.github/workflows/full.yml +++ b/.github/workflows/full.yml @@ -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: | @@ -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: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ee737d58..4589c2fc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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: | @@ -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: diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml index baaf45d8..f4479b51 100644 --- a/.github/workflows/schedule.yml +++ b/.github/workflows/schedule.yml @@ -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 @@ -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: | @@ -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: | @@ -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 diff --git a/Dockerfile.ci b/Dockerfile.ci index ca99ec64..5a3c51e1 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,4 +1,4 @@ -FROM openvino/cvat_server +FROM cvat/server ENV DJANGO_CONFIGURATION=testing USER root diff --git a/README.md b/README.md index 2d61eea6..acfe987d 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/components/analytics/docker-compose.analytics.yml b/components/analytics/docker-compose.analytics.yml index 4a8c769c..ae42f259 100644 --- a/components/analytics/docker-compose.analytics.yml +++ b/components/analytics/docker-compose.analytics.yml @@ -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' diff --git a/docker-compose.yml b/docker-compose.yml index d6185788..0756e5b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: cvat: container_name: cvat - image: openvino/cvat_server + image: cvat/server restart: always depends_on: - cvat_redis @@ -57,7 +57,7 @@ services: cvat_ui: container_name: cvat_ui - image: openvino/cvat_ui + image: cvat/ui restart: always depends_on: - cvat diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 4bb3f264..df35bf35 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -9,7 +9,7 @@ fullnameOverride: "" cvat: backend: replicas: 1 - image: openvino/cvat_server + image: cvat/server tag: latest permissionFix: enabled: true @@ -59,7 +59,7 @@ cvat: size: 20Gi frontend: replicas: 1 - image: openvino/cvat_ui + image: cvat/ui tag: latest labels: {} # test: test diff --git a/site/content/en/docs/manual/advanced/dataset_manifest.md b/site/content/en/docs/manual/advanced/dataset_manifest.md index 97f73250..61be7344 100644 --- a/site/content/en/docs/manual/advanced/dataset_manifest.md +++ b/site/content/en/docs/manual/advanced/dataset_manifest.md @@ -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/ ``` @@ -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/ ```