Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: setup columbia version cicd #229

Merged
merged 1 commit into from
Jun 1, 2023
Merged

feat: setup columbia version cicd #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: ci
on:
push:
branches:
- 'master'
- columbia

jobs:
docker:
Expand All @@ -28,7 +28,7 @@ jobs:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: openv2x/dandelion:latest
tags: openv2x/dandelion:columbia
build-args: |
GIT_BRANCH=${{ github.ref_name }}
REPO_URL=https://github.com/open-v2x/dandelion
Expand All @@ -49,9 +49,9 @@ jobs:
set -e

(docker images | grep none | awk '{print $3}' | xargs -I{} docker rmi -f {}) || true
docker pull openv2x/dandelion:latest
docker tag openv2x/dandelion:latest registry.cn-shanghai.aliyuncs.com/openv2x/dandelion:latest
docker push registry.cn-shanghai.aliyuncs.com/openv2x/dandelion:latest
docker pull openv2x/dandelion:columbia
docker tag openv2x/dandelion:columbia registry.cn-shanghai.aliyuncs.com/openv2x/dandelion:columbia
docker push registry.cn-shanghai.aliyuncs.com/openv2x/dandelion:columbia

ssh:
needs: acr
Expand All @@ -60,13 +60,13 @@ jobs:
- name: apply to all-in-one environment
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.AIO_MASTER_HOST }}
username: ${{ secrets.AIO_MASTER_USERNAME }}
key: ${{ secrets.AIO_MASTER_KEY }}
port: ${{ secrets.AIO_MASTER_PORT }}
host: ${{ secrets.AIO_ALBANY_HOST }}
username: ${{ secrets.AIO_ALBANY_USERNAME }}
key: ${{ secrets.AIO_ALBANY_KEY }}
port: ${{ secrets.AIO_ALBANY_PORT }}
script: |
set -e
rm -rf openv2x-aio-master.tar.gz && wget https://openv2x.oss-ap-southeast-1.aliyuncs.com/deploy/master/openv2x-aio-master.tar.gz
rm -rf src && tar zxvf openv2x-aio-master.tar.gz
rm -rf openv2x-aio-columbia.tar.gz && wget https://openv2x.oss-ap-southeast-1.aliyuncs.com/deploy/master/openv2x-aio-columbia.tar.gz
rm -rf src && tar zxvf openv2x-aio-columbia.tar.gz
cd src
sh install.sh
2 changes: 1 addition & 1 deletion .github/workflows/tox-pep8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: pep8
on:
push:
branches:
- master
- columbia
pull_request:
types: [opened, synchronize]

Expand Down
6 changes: 3 additions & 3 deletions README-zh_CN.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@ OpenV2X 设备管理 - APIServer
RELEASE_VERSION=`git rev-parse --short HEAD`_`date -u +%Y-%m-%dT%H:%M:%S%z`
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
GIT_COMMIT=`git rev-parse --verify HEAD`
docker build --no-cache --pull --force-rm --build-arg RELEASE_VERSION=${RELEASE_VERSION} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg GIT_COMMIT=${GIT_COMMIT} -f Dockerfile -t dandelion:latest .
docker build --no-cache --pull --force-rm --build-arg RELEASE_VERSION=${RELEASE_VERSION} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg GIT_COMMIT=${GIT_COMMIT} -f Dockerfile -t dandelion:columbia .

- 以容器方式运行 dandelion 服务

.. code:: bash

mkdir -p /var/log/dandelion
docker run -d --name dandelion_bootstrap -e KOLLA_BOOTSTRAP="" -v /etc/dandelion/dandelion.conf:/etc/dandelion/dandelion.conf --net=host dandelion:latest
docker run -d --name dandelion_bootstrap -e KOLLA_BOOTSTRAP="" -v /etc/dandelion/dandelion.conf:/etc/dandelion/dandelion.conf --net=host dandelion:columbia
docker rm dandelion_bootstrap
docker run -d --name dandelion --restart=always -v /etc/dandelion/dandelion.conf:/etc/dandelion/dandelion.conf -v /var/log/dandelion:/var/log/dandelion --net=host dandelion:latest
docker run -d --name dandelion --restart=always -v /etc/dandelion/dandelion.conf:/etc/dandelion/dandelion.conf -v /var/log/dandelion:/var/log/dandelion --net=host dandelion:columbia

.. _`Local Development (Linux)`:
本地开发 (Linux)
Expand Down
6 changes: 3 additions & 3 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,16 @@ Build && Run (Linux)
RELEASE_VERSION=`git rev-parse --short HEAD`_`date -u +%Y-%m-%dT%H:%M:%S%z`
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
GIT_COMMIT=`git rev-parse --verify HEAD`
docker build --no-cache --pull --force-rm --build-arg RELEASE_VERSION=${RELEASE_VERSION} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg GIT_COMMIT=${GIT_COMMIT} -f Dockerfile -t dandelion:latest .
docker build --no-cache --pull --force-rm --build-arg RELEASE_VERSION=${RELEASE_VERSION} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg GIT_COMMIT=${GIT_COMMIT} -f Dockerfile -t dandelion:columbia .

- Run dandelion service as container.

.. code:: bash

mkdir -p /var/log/dandelion
docker run -d --name dandelion_bootstrap -e KOLLA_BOOTSTRAP="" -v /etc/dandelion/dandelion.conf:/etc/dandelion/dandelion.conf --net=host dandelion:latest
docker run -d --name dandelion_bootstrap -e KOLLA_BOOTSTRAP="" -v /etc/dandelion/dandelion.conf:/etc/dandelion/dandelion.conf --net=host dandelion:columbia
docker rm dandelion_bootstrap
docker run -d --name dandelion --restart=always -v /etc/dandelion/dandelion.conf:/etc/dandelion/dandelion.conf -v /var/log/dandelion:/var/log/dandelion --net=host dandelion:latest
docker run -d --name dandelion --restart=always -v /etc/dandelion/dandelion.conf:/etc/dandelion/dandelion.conf -v /var/log/dandelion:/var/log/dandelion --net=host dandelion:columbia

Local Development (Linux)
-------------------------
Expand Down