wangchunlin
/
cvat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename Docker images (#12)

Browse Source
main
Kirill Sizov 4 years ago committed by GitHub
parent 82634d19ac
commit 3d3903c01f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

8
.github/workflows/full.yml vendored
Unescape Escape View File

@ -184,10 +184,10 @@ jobs:
- name: Pull CVAT images - name: Pull CVAT images
run: | run: |
docker pull ${{ steps.meta-server.outputs.tags }} 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 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 - name: Running OPA tests
run: | run: |
@ -282,10 +282,10 @@ jobs:
- name: Pull CVAT images - name: Pull CVAT images
run: | run: |
docker pull ${{ steps.meta-server.outputs.tags }} 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 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 - name: Run CVAT instance
run: | run: |

8
.github/workflows/main.yml vendored
Unescape Escape View File

@ -141,10 +141,10 @@ jobs:
- name: Pull CVAT images - name: Pull CVAT images
run: | run: |
docker pull ${{ steps.meta-server.outputs.tags }} 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 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 - name: Running OPA tests
run: | run: |
@ -227,10 +227,10 @@ jobs:
- name: Pull CVAT images - name: Pull CVAT images
run: | run: |
docker pull ${{ steps.meta-server.outputs.tags }} 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 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 - uses: actions/setup-node@v2
with: with:

10
.github/workflows/schedule.yml vendored
Unescape Escape View File

@ -174,7 +174,7 @@ jobs:
context: . context: .
file: ./Dockerfile.ui file: ./Dockerfile.ui
cache-from: type=local,src=/tmp/cvat_cache_ui cache-from: type=local,src=/tmp/cvat_cache_ui
tags: openvino/cvat_ui:latest tags: cvat/ui:latest
load: true load: true
- name: Building CVAT Logstash image - name: Building CVAT Logstash image
@ -214,7 +214,7 @@ jobs:
- name: Pull CVAT server image - name: Pull CVAT server image
run: | run: |
docker pull ${{ steps.meta-server.outputs.tags }} 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 - name: OPA tests
run: | run: |
@ -291,10 +291,10 @@ jobs:
- name: Pull CVAT UI image - name: Pull CVAT UI image
run: | run: |
docker pull ${{ steps.meta-server.outputs.tags }} 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 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 - name: Run CVAT instance
run: | run: |
@ -416,7 +416,7 @@ jobs:
- name: Pull CVAT server image - name: Pull CVAT server image
run: | run: |
docker pull ${{ steps.meta-server.outputs.tags }} 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 - name: Downloading coverage results
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2

2
Dockerfile.ci
Unescape Escape View File

@ -1,4 +1,4 @@
FROM openvino/cvat_server FROM cvat/server
ENV DJANGO_CONFIGURATION=testing ENV DJANGO_CONFIGURATION=testing
USER root USER root

4
README.md
Unescape Escape View File

@ -121,8 +121,8 @@ Limitations:
Prebuilt docker images for CVAT releases are available on Docker Hub: Prebuilt docker images for CVAT releases are available on Docker Hub:
- [cvat_server](https://hub.docker.com/r/openvino/cvat_server) - [cvat_server](https://hub.docker.com/r/cvat/server)
- [cvat_ui](https://hub.docker.com/r/openvino/cvat_ui) - [cvat_ui](https://hub.docker.com/r/cvat/ui)
## REST API ## REST API
The current REST API version is `2.0-alpha`. We focus on its improvement and therefore The current REST API version is `2.0-alpha`. We focus on its improvement and therefore

2
components/analytics/docker-compose.analytics.yml
Unescape Escape View File

@ -27,7 +27,7 @@ services:
cvat_kibana_setup: cvat_kibana_setup:
container_name: cvat_kibana_setup container_name: cvat_kibana_setup
image: openvino/cvat_server image: cvat/server
volumes: ['./components/analytics/kibana:/home/django/kibana:ro'] volumes: ['./components/analytics/kibana:/home/django/kibana:ro']
depends_on: ['cvat'] depends_on: ['cvat']
working_dir: '/home/django' working_dir: '/home/django'

4
docker-compose.yml
Unescape Escape View File

@ -27,7 +27,7 @@ services:
cvat: cvat:
container_name: cvat container_name: cvat
image: openvino/cvat_server image: cvat/server
restart: always restart: always
depends_on: depends_on:
- cvat_redis - cvat_redis
@ -57,7 +57,7 @@ services:
cvat_ui: cvat_ui:
container_name: cvat_ui container_name: cvat_ui
image: openvino/cvat_ui image: cvat/ui
restart: always restart: always
depends_on: depends_on:
- cvat - cvat

4
helm-chart/values.yaml
Unescape Escape View File

@ -9,7 +9,7 @@ fullnameOverride: ""
cvat: cvat:
backend: backend:
replicas: 1 replicas: 1
image: openvino/cvat_server image: cvat/server
tag: latest tag: latest
permissionFix: permissionFix:
enabled: true enabled: true
@ -59,7 +59,7 @@ cvat:
size: 20Gi size: 20Gi
frontend: frontend:
replicas: 1 replicas: 1
image: openvino/cvat_ui image: cvat/ui
tag: latest tag: latest
labels: {} labels: {}
# test: test # test: test

8
site/content/en/docs/manual/advanced/dataset_manifest.md
Unescape Escape View File

@ -57,10 +57,10 @@ optional arguments:
Directory where the manifest file will be saved Directory where the manifest file will be saved
``` ```
### Alternative way to use with openvino/cvat_server ### Alternative way to use with cvat/server
```bash ```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/ 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" 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 ```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/ utils/dataset_manifest/create.py --output-dir ~/manifest/ ~/manifest/images/
``` ```

Write Preview
Loading…
Cancel
Save