Skip to content

Commit ad54b55

Browse files
chris-sun-starchris-sun-star
committed
Merge branch 'master' into oceanbase-ce-optimize
2 parents f8aedf3 + 19766aa commit ad54b55

File tree

8 files changed

+98
-25
lines changed

8 files changed

+98
-25
lines changed

‎.github/workflows/release-ob-configserver.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Log in to Docker hub
16-
uses: docker/login-action@v2
16+
uses: docker/login-action@v3
1717
with:
1818
username: ${{ secrets.DOCKER_USERNAME }}
1919
password: ${{ secrets.DOCKER_PASSWORD }}
2020

2121
- name: Checkout repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Set up QEMU
25-
uses: docker/setup-qemu-action@v2
25+
uses: docker/setup-qemu-action@v3
2626

2727
- name: Set up Docker Buildx
28-
uses: docker/setup-buildx-action@v2
28+
uses: docker/setup-buildx-action@v3
2929

3030
- name: Set Version variables
3131
id: set_version_vars
3232
run: echo "version=$(echo $tagName | grep -P '(\d*\.\d*\.\d*-\d*)' --only-matching)" >> $GITHUB_OUTPUT
3333

3434
- name: Build and push ob-configserver w/o cache
35-
uses: docker/build-push-action@v2
35+
uses: docker/build-push-action@v6
3636
with:
3737
context: ./ob-configserver
3838
platforms: linux/amd64,linux/arm64

‎.github/workflows/release-obagent.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Log in to Docker hub
16-
uses: docker/login-action@v2
16+
uses: docker/login-action@v3
1717
with:
1818
username: ${{ secrets.DOCKER_USERNAME }}
1919
password: ${{ secrets.DOCKER_PASSWORD }}
2020

2121
- name: Checkout repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Set up QEMU
25-
uses: docker/setup-qemu-action@v2
25+
uses: docker/setup-qemu-action@v3
2626

2727
- name: Set up Docker Buildx
28-
uses: docker/setup-buildx-action@v2
28+
uses: docker/setup-buildx-action@v3
2929

3030
- name: Set Version variables
3131
id: set_version_vars
3232
run: echo "version=$(echo $tagName | grep -P '(\d*\.\d*\.\d*-\d*)' --only-matching)" >> $GITHUB_OUTPUT
3333

3434
- name: Build and push obagent w/o cache
35-
uses: docker/build-push-action@v2
35+
uses: docker/build-push-action@v6
3636
with:
3737
context: ./obagent
3838
platforms: linux/amd64,linux/arm64

‎.github/workflows/release-oblogproxy-ce.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: release oblogproxy-ce
2+
3+
on:
4+
push:
5+
tags:
6+
- "oblogproxy-ce-*"
7+
8+
env:
9+
tagName: ${{ github.ref_name }}
10+
11+
jobs:
12+
release-oblogproxy-ce:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Log in to Docker hub
16+
uses: docker/login-action@v3
17+
with:
18+
username: ${{ secrets.DOCKER_USERNAME }}
19+
password: ${{ secrets.DOCKER_PASSWORD }}
20+
21+
- name: Checkout repository
22+
uses: actions/checkout@v4
23+
24+
- name: Set up QEMU
25+
uses: docker/setup-qemu-action@v3
26+
27+
- name: Set up Docker Buildx
28+
uses: docker/setup-buildx-action@v3
29+
30+
- name: Set Version variables
31+
id: set_version_vars
32+
run: echo "version=$(echo $tagName | grep -P '(\d*\.\d*\.\d*-\d{18})' --only-matching)" >> $GITHUB_OUTPUT
33+
34+
- name: Build and push
35+
uses: docker/build-push-action@v6
36+
with:
37+
context: ./oblogproxy-ce
38+
platforms: linux/amd64,linux/arm64
39+
file: ./oblogproxy-ce/Dockerfile
40+
push: true
41+
tags: ${{ vars.DOCKER_PUSH_BASE }}/oblogproxy-ce:${{ steps.set_version_vars.outputs.version }}
42+
build-args: |
43+
VERSION=${{ steps.set_version_vars.outputs.version }}

‎.github/workflows/release-obproxy-ce.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,36 @@ name: release obproxy-ce
33
on:
44
push:
55
tags:
6-
- "obproxy-*"
6+
- "obproxy-ce-*"
77

88
env:
99
tagName: ${{ github.ref_name }}
1010

1111
jobs:
12-
release-obproxy:
12+
release-obproxy-ce:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Log in to Docker hub
16-
uses: docker/login-action@v2
16+
uses: docker/login-action@v3
1717
with:
1818
username: ${{ secrets.DOCKER_USERNAME }}
1919
password: ${{ secrets.DOCKER_PASSWORD }}
2020

2121
- name: Checkout repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Set up QEMU
25-
uses: docker/setup-qemu-action@v2
25+
uses: docker/setup-qemu-action@v3
2626

2727
- name: Set up Docker Buildx
28-
uses: docker/setup-buildx-action@v2
28+
uses: docker/setup-buildx-action@v3
2929

3030
- name: Set Version variables
3131
id: set_version_vars
3232
run: echo "version=$(echo $tagName | grep -P '(\d*\.\d*\.\d*\.\d*-\d*)' --only-matching)" >> $GITHUB_OUTPUT
3333

3434
- name: Build and push obproxy w/o cache
35-
uses: docker/build-push-action@v2
35+
uses: docker/build-push-action@v6
3636
with:
3737
context: ./obproxy-ce
3838
platforms: linux/amd64,linux/arm64

‎.github/workflows/release-oceanbase-cloud-native.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Log in to Docker hub
16-
uses: docker/login-action@v2
16+
uses: docker/login-action@v3
1717
with:
1818
username: ${{ secrets.DOCKER_USERNAME }}
1919
password: ${{ secrets.DOCKER_PASSWORD }}
2020

2121
- name: Checkout repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Set up QEMU
25-
uses: docker/setup-qemu-action@v2
25+
uses: docker/setup-qemu-action@v3
2626

2727
- name: Set up Docker Buildx
28-
uses: docker/setup-buildx-action@v2
28+
uses: docker/setup-buildx-action@v3
2929

3030
- name: Set Version variables
3131
id: set_version_vars
3232
run: echo "version=$(echo $tagName | grep -P '(\d*\.\d*\.\d*\.\d*-\d{18})' --only-matching)" >> $GITHUB_OUTPUT
3333

3434
- name: Build and push observer w/o cache
35-
uses: docker/build-push-action@v2
35+
uses: docker/build-push-action@v6
3636
with:
3737
context: ./oceanbase-cloud-native
3838
platforms: linux/amd64,linux/arm64

‎.github/workflows/ci-oceanbase-ce.yml renamed to ‎.github/workflows/test-oceanbase-ce.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
name: oceanbase-ce
1+
name: test oceanbase-ce
22

33
on:
44
push:
55
paths:
6-
- '.github/workflows/ci-oceanbase-ce.yml'
6+
- '.github/workflows/test-oceanbase-ce.yml'
77
- 'oceanbase-ce/**'
88
pull_request:
99
paths:
10-
- '.github/workflows/ci-oceanbase-ce.yml'
10+
- '.github/workflows/test-oceanbase-ce.yml'
1111
- 'oceanbase-ce/**'
1212

1313
jobs:

‎oblogproxy-ce/Dockerfile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
FROM openanolis/anolisos:8.8
2+
3+
ARG VERSION
4+
5+
RUN yum install -y yum-utils diffutils && \
6+
yum-config-manager --add-repo https://mirrors.oceanbase.com/oceanbase/OceanBase.repo && \
7+
sed -i 's/$releasever/8/' /etc/yum.repos.d/OceanBase.repo && \
8+
if [[ -z "${VERSION}" ]]; then \
9+
echo "VERSION is empty, build image with the latest rpm"; \
10+
version=`yum info oblogproxy | grep Version | awk '{print $3}'`; \
11+
release=`yum info oblogproxy | grep Release | awk '{print $3}' | awk -F. '{print $1}'`; \
12+
VERSION="${version}-${release}"; \
13+
fi && \
14+
yum install -y oblogproxy-${VERSION}.el8 && yum clean all
15+
16+
COPY start.sh /root/boot/
17+
WORKDIR /root/boot/
18+
19+
EXPOSE 2983
20+
21+
ENTRYPOINT ["bash", "-c", "./start.sh"]

‎oblogproxy-ce/start.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
if [[ -n ${OB_SYS_USERNAME} && -n ${OB_SYS_PASSWORD} ]]; then
4+
echo "y" | /usr/local/oblogproxy/run.sh config_sys ${OB_SYS_USERNAME} ${OB_ROOT_PASSWORD}
5+
fi
6+
7+
rm -rf /usr/local/oblogproxy/run/*
8+
/usr/local/oblogproxy/run.sh start
9+
exec /sbin/init

0 commit comments

Comments
 (0)