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.

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

Integrate CI/CD with original master branch #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 7 additions & 8 deletions .github/workflows/deploy-docker-images.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name: Deploy Docker Images

on:
push:
tags:
- v[0-9]+.[0-9]+.[0-9]+
pull_request_review:
types: [submitted]
pull_request:
types: [opened, reopened, edited, synchronize]

jobs:
build-and-deploy:
Expand All @@ -22,11 +23,10 @@ jobs:
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-

- uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
username: ${{ secrets.DOCCLAB_DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCCLAB_DOCKERHUB_PASSWORD }}
- uses: docker/setup-buildx-action@v1
with:
install: true
Expand All @@ -37,5 +37,4 @@ jobs:
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-

- run: make package publish-image Repo=${{ secrets.DOCKER_HUB_USERNAME }} Tag=${GITHUB_REF#refs/tags/v}
- run: make package publish-image Repo=${{ secrets.DOCCLAB_DOCKERHUB_USERNAME }} Tag=${GITHUB_REF#refs/tags/v}
41 changes: 41 additions & 0 deletions .github/workflows/merge-pr-upload-images-to-latest.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Deploy Docker Images

on:
push:
branches:
- master

jobs:
build-and-deploy:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '8'
- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- uses: docker/login-action@v1
with:
username: ${{ secrets.DOCCLAB_DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCCLAB_DOCKERHUB_PASSWORD }}
- uses: docker/setup-buildx-action@v1
with:
install: true
- name: Cache Docker layers
uses: actions/cache@v2
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- run: make package

- run: make publish-image Repo=${{ secrets.DOCCLAB_DOCKERHUB_USERNAME }} Tag=latest
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
> TrainTicket with Jaeger [This is a copy from original k8s-with-jaeger branch, it will use docclab's images instead of fudan's]

We provide a Tracing System based on [Jaeger](https://www.jaegertracing.io).

After the deployment, you can visit the Jaeger Webpage at [http://[Node-IP]:32688](http://[Node-IP]:32688) to view traces in the system.

![Jaeger](<https://raw.githubusercontent.com/FudanSELab/train-ticket/master/image/jaeger.png>)

If you'd like to see the source code which uses Jaeger, it's in the [jaeger branch](https://github.com/FudanSELab/train-ticket/tree/jaeger).
Loading