diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5bf028eb6101900fd1c200a22d702c3f5328f640..58f193f8dfc7460c37cc77b4e1f0a28598a033ed 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -309,3 +309,44 @@ jobs: with: name: cypress_screenshots_${{ matrix.specs }} path: ${{ github.workspace }}/tests/cypress/screenshots + + publish_dev_images: + if: github.ref == 'refs/heads/develop' + needs: [rest_api, unit_testing, e2e_testing] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Download CVAT server images + uses: actions/download-artifact@v3 + with: + name: cvat_server + path: /tmp/cvat_server/ + + - name: Download CVAT UI images + uses: actions/download-artifact@v3 + with: + name: cvat_ui + path: /tmp/cvat_ui/ + + - name: Load Docker images + run: | + docker load --input /tmp/cvat_server/image.tar + docker load --input /tmp/cvat_ui/image.tar + + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Push to Docker Hub + env: + SERVER_IMAGE_REPO: ${{ secrets.DOCKERHUB_USERNAME }}/server + UI_IMAGE_REPO: ${{ secrets.DOCKERHUB_USERNAME }}/ui + run: | + docker tag cvat/server:latest "${SERVER_IMAGE_REPO}:dev" + docker push "${SERVER_IMAGE_REPO}:dev" + + docker tag cvat/ui:latest "${UI_IMAGE_REPO}:dev" + docker push "${UI_IMAGE_REPO}:dev" diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c930fcd3f2bc76b2771a63d27226f19c546f601..21cc193228e428d7e1b4190ecc90b63befb5fbaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added Python SDK package (`cvat-sdk`) - Previews for jobs - Documentation for LDAP authentication () +- Publishing dev version of CVAT docker images () ### Changed - Bumped nuclio version to 1.8.14 diff --git a/components/analytics/docker-compose.analytics.yml b/components/analytics/docker-compose.analytics.yml index ae42f259a51c4dc14e4cb9cc1e0c79f25d8746cf..3dbc89388c5350dfb184cda21cf2fdead27df3fb 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: cvat/server + image: cvat/server:${CVAT_VERSION:-latest} 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 0756e5b161b070dcfb5a68458cba905d4d782616..1761221ec9a1773054a9cf6555bff02c26b2c7ee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: cvat: container_name: cvat - image: cvat/server + image: cvat/server:${CVAT_VERSION:-latest} restart: always depends_on: - cvat_redis @@ -57,7 +57,7 @@ services: cvat_ui: container_name: cvat_ui - image: cvat/ui + image: cvat/ui:${CVAT_VERSION:-latest} restart: always depends_on: - cvat diff --git a/site/content/en/docs/administration/basics/installation.md b/site/content/en/docs/administration/basics/installation.md index c95240edba241e404bb4ab085bfcb52406b90cb4..ca795598cb541b984824d08c95c939236b61cb24 100644 --- a/site/content/en/docs/administration/basics/installation.md +++ b/site/content/en/docs/administration/basics/installation.md @@ -89,6 +89,11 @@ For access from China, read [sources for users from China](#sources-for-users-fr docker-compose up -d ``` +- Use `CVAT_VERSION` environment variable to specify the version of CVAT you want to install (e.g `v2.1.0`, `dev`): + ```bash + CVAT_VERSION=dev docker-compose up -d + ``` + - Alternative: if you want to build the images locally with unreleased changes run the following command. It will take some time to build CVAT images.