Skip to content

Commit 69d12b3

Browse files
authored
Merge pull request #31 from balinorLiang/v5.1_release
release dockerfile ivorysql v5.1
2 parents 421170a + 0067e3b commit 69d12b3

File tree

12 files changed

+23
-23
lines changed

12 files changed

+23
-23
lines changed

5/bookworm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN mkdir /docker-entrypoint-initdb.d
2121

2222
# Set environment variables for IvorySQL
2323
ENV IVORY_MAJOR 5
24-
ENV IVORY_VERSION 5.0
24+
ENV IVORY_VERSION 5.1
2525
ARG USE_CHINA_MIRROR=false
2626

2727
# Use China mirror if specified
@@ -118,7 +118,7 @@ COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/iv
118118
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
119119

120120
ENV IVORY_MAJOR 5
121-
ENV IVORY_VERSION 5.0
121+
ENV IVORY_VERSION 5.1
122122
ARG USE_CHINA_MIRROR=false
123123
RUN mkdir /docker-entrypoint-initdb.d
124124

5/trixie/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN mkdir /docker-entrypoint-initdb.d
2121

2222
# Set environment variables for IvorySQL
2323
ENV IVORY_MAJOR 5
24-
ENV IVORY_VERSION 5.0
24+
ENV IVORY_VERSION 5.1
2525
ARG USE_CHINA_MIRROR=false
2626

2727
# Use China mirror if specified
@@ -118,7 +118,7 @@ COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/iv
118118
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
119119

120120
ENV IVORY_MAJOR 5
121-
ENV IVORY_VERSION 5.0
121+
ENV IVORY_VERSION 5.1
122122
ARG USE_CHINA_MIRROR=false
123123
RUN mkdir /docker-entrypoint-initdb.d
124124

5/ubi8/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN groupadd -g 1000 ivorysql; \
1919
RUN mkdir /docker-entrypoint-initdb.d
2020

2121
ENV IVORY_MAJOR 5
22-
ENV IVORY_VERSION 5.0
22+
ENV IVORY_VERSION 5.1
2323

2424
RUN curl -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Centos-8.repo; \
2525
sed -i -e '/mirrors.cloud.aliyuncs.com/d' -e '/mirrors.aliyuncs.com/d' /etc/yum.repos.d/CentOS-Base.repo
@@ -89,7 +89,7 @@ COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/ivo
8989
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
9090

9191
ENV IVORY_MAJOR 5
92-
ENV IVORY_VERSION 5.0
92+
ENV IVORY_VERSION 5.1
9393

9494
RUN mkdir /docker-entrypoint-initdb.d
9595

docker-cluster/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM redhat/ubi8:latest as builder
22

33
ARG MAJOR_VERSION="5"
4-
ARG FULL_VERSION="5.0"
4+
ARG FULL_VERSION="5.1"
55

66
# explicitly set user/group IDs
77
RUN groupadd -g 1000 ivorysql; \
@@ -71,7 +71,7 @@ RUN mkdir -p /usr/src/ivorysql; \
7171
FROM redhat/ubi8:latest
7272

7373
ARG MAJOR_VERSION="5"
74-
ARG FULL_VERSION="5.0"
74+
ARG FULL_VERSION="5.1"
7575

7676
RUN groupadd -g 1000 ivorysql; \
7777
useradd -u 1000 -g ivorysql -d /var/local/ivorysql -s /bin/sh ivorysql;

docker-cluster/docker-compose/docker-compose-ivypatroni_1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
ivypatroni1:
3-
image: ivorysql/docker-compose-ha-cluster:5.0-4.0.6-ubi8
3+
image: ivorysql/docker-compose-ha-cluster:5.1-4.0.6-ubi8
44
restart: always
55
container_name: ivyhac1
66
user: "ivorysql"

docker-cluster/docker-compose/docker-compose-ivypatroni_2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
ivypatroni2:
3-
image: ivorysql/docker-compose-ha-cluster:5.0-4.0.6-ubi8
3+
image: ivorysql/docker-compose-ha-cluster:5.1-4.0.6-ubi8
44
restart: always
55
container_name: ivyhac2
66
user: "ivorysql"

docker-cluster/docker-compose/docker-compose-ivypatroni_3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
ivypatroni3:
3-
image: ivorysql/docker-compose-ha-cluster:5.0-4.0.6-ubi8
3+
image: ivorysql/docker-compose-ha-cluster:5.1-4.0.6-ubi8
44
restart: always
55
container_name: ivyhac3
66
user: "ivorysql"

docker-cluster/docker-swarm/docker-swarm-ivypatroni.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.7'
22

33
services:
44
ivypatroni1:
5-
image: ivorysql/docker-swarm-ha-cluster:5.0-4.0.6-ubi8
5+
image: ivorysql/docker-swarm-ha-cluster:5.1-4.0.6-ubi8
66
environment:
77
IVORYSQL_PASSWORD: 123456
88
PATRONI_SCOPE: hgdb-cluster1
@@ -31,7 +31,7 @@ services:
3131
- "1521:1521"
3232

3333
ivypatroni2:
34-
image: ivorysql/docker-swarm-ha-cluster:5.0-4.0.6-ubi8
34+
image: ivorysql/docker-swarm-ha-cluster:5.1-4.0.6-ubi8
3535
environment:
3636
IVORYSQL_PASSWORD: 123456
3737
PATRONI_SCOPE: hgdb-cluster1

k8s-cluster/ha-cluster/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM redhat/ubi8:latest as builder
22

33
ARG MAJOR_VERSION="5"
4-
ARG FULL_VERSION="5.0"
4+
ARG FULL_VERSION="5.1"
55

66
# explicitly set user/group IDs
77
RUN groupadd -g 1000 ivorysql; \
@@ -71,7 +71,7 @@ RUN mkdir -p /usr/src/ivorysql; \
7171
FROM redhat/ubi8:latest
7272

7373
ARG MAJOR_VERSION="5"
74-
ARG FULL_VERSION="5.0"
74+
ARG FULL_VERSION="5.1"
7575

7676
RUN groupadd -g 1000 ivorysql; \
7777
useradd -u 1000 -g ivorysql -d /var/local/ivorysql -s /bin/sh ivorysql;
@@ -121,4 +121,4 @@ EXPOSE 5432 5866 1521
121121

122122
USER ivorysql
123123

124-
ENTRYPOINT ["/bin/sh", "/docker-entrypoint.sh"]
124+
ENTRYPOINT ["/bin/sh", "/docker-entrypoint.sh"]

k8s-cluster/ha-cluster/helm_charts/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ applicationName: ivyhac
1616
serviceConfigName: ivorysql-patroni-hac-config
1717
databaseServiceName: ivorysql-patroni-hac
1818
ivyHacReplicaServiceName: ivorysql-patroni-hac-repl
19-
majorVersion: 4
19+
majorVersion: 5
2020
compatibleMode: oracle
2121

2222
image:
2323
repository: ivorysql/k8s-ha-cluster
2424
pullPolicy: IfNotPresent
2525
# Overrides the image tag whose default is the chart appVersion.
26-
tag: "5.0-4.0.6-ubi8"
26+
tag: "5.1-4.0.6-ubi8"
2727

2828
imagePullSecrets: []
2929
nameOverride: ""

0 commit comments

Comments
 (0)