milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

docker: move compose file from root path to docker folder (#4890) 

* docker: move compose file

Signed-off-by: Eric Shen <ericshenyuhao@outlook.com>
pull/4959/head
Eric Shen 2021-04-15 03:59:43 -05:00 committed by Xiangyu Wang
parent f65cd0b6ba
commit 6b1c09c8c0
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/core.yml vendored
View File

@ -42,17 +42,17 @@ jobs:
- name: Docker Pull
shell: bash
run: |
docker-compose pull --ignore-pull-failures db
docker-compose pull --ignore-pull-failures ubuntu-core
docker-compose -f ./docker/docker-compose.yml pull --ignore-pull-failures db
docker-compose -f ./docker/docker-compose.yml pull --ignore-pull-failures ubuntu-core
- name: Docker Build
shell: bash
run: |
docker-compose build ubuntu-core
docker-compose -f ./docker/docker-compose.yml build ubuntu-core
docker rmi $(docker images | grep '<none>' | awk '{print $3}') || exit 0
- name: Docker Run
run: |
docker-compose run --use-aliases -d db
docker-compose run ubuntu-core
docker-compose -f ./docker/docker-compose.yml run --use-aliases -d db
docker-compose -f ./docker/docker-compose.yml run ubuntu-core
- name: Docker Push
if: success() && github.event_name == 'push' && github.repository == 'milvus-io/milvus'
continue-on-error: true
@ -60,7 +60,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKERHUB_USER }} \
-p ${{ secrets.DOCKERHUB_TOKEN }}
docker-compose push ubuntu-core
docker-compose -f ./docker/docker-compose.yml push ubuntu-core
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
@ -90,17 +90,17 @@ jobs:
- name: Docker Pull
shell: bash
run: |
docker-compose pull --ignore-pull-failures db
docker-compose pull --ignore-pull-failures centos-core
docker-compose -f ./docker/docker-compose.yml pull --ignore-pull-failures db
docker-compose -f ./docker/docker-compose.yml pull --ignore-pull-failures centos-core
- name: Docker Build
shell: bash
run: |
docker-compose build centos-core
docker-compose -f ./docker/docker-compose.yml build centos-core
docker rmi $(docker images | grep '<none>' | awk '{print $3}') || exit 0
- name: Docker Run
run: |
docker-compose run --use-aliases -d db
docker-compose run centos-core
docker-compose -f ./docker/docker-compose.yml run --use-aliases -d db
docker-compose -f ./docker/docker-compose.yml run centos-core
- name: Docker Push
if: success() && github.event_name == 'push' && github.repository == 'milvus-io/milvus'
continue-on-error: true
@ -108,7 +108,7 @@ jobs:
run: |
docker login -u ${{ secrets.DOCKERHUB_USER }} \
-p ${{ secrets.DOCKERHUB_TOKEN }}
docker-compose push centos-core
docker-compose -f ./docker/docker-compose.yml push centos-core
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:

0
.env → docker/.env
View File

10
docker-compose.yml → docker/docker-compose.yml
View File

@ -27,14 +27,14 @@ services:
image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-core
build:
context: .
dockerfile: ci/docker/ubuntu-${UBUNTU}-core.dockerfile
dockerfile: ../ci/docker/ubuntu-${UBUNTU}-core.dockerfile
cache_from:
- ${REPO}:${ARCH}-ubuntu-${UBUNTU}-core
shm_size: 2G
environment:
<<: *ccache
volumes: &ubuntu-volumes
- .:/milvus:delegated
- ..:/milvus:delegated
- ${ARCH}-ubuntu-${UBUNTU}-cache:/build:delegated
networks:
- milvus
@ -47,14 +47,14 @@ services:
image: ${REPO}:${ARCH}-centos-${CENTOS}-core
build:
context: .
dockerfile: ci/docker/centos-${CENTOS}-core.dockerfile
dockerfile: ../ci/docker/centos-${CENTOS}-core.dockerfile
cache_from:
- ${REPO}:${ARCH}-centos-${CENTOS}-core
shm_size: 2G
environment:
<<: *ccache
volumes: &centos-volumes
- .:/milvus:delegated
- ..:/milvus:delegated
- ${ARCH}-centos-${CENTOS}-cache:/build:delegated
networks:
- milvus
@ -64,4 +64,4 @@ services:
/milvus/ci/scripts/coverage.sh"]
networks:
milvus:
milvus: