Skip to content

Commit d46fce3

Browse files
authored
Merge pull request #35 from jiaoshuntian/main
v5.6 upgrade
2 parents e67ab3b + 9f4a58e commit d46fce3

12 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎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.4
24+
ENV IVORY_VERSION 5.6
2525
ARG USE_CHINA_MIRROR=false
2626

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

121121
ENV IVORY_MAJOR 5
122-
ENV IVORY_VERSION 5.4
122+
ENV IVORY_VERSION 5.6
123123
ARG USE_CHINA_MIRROR=false
124124
RUN mkdir /docker-entrypoint-initdb.d
125125

‎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.4
24+
ENV IVORY_VERSION 5.6
2525
ARG USE_CHINA_MIRROR=false
2626

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

121121
ENV IVORY_MAJOR 5
122-
ENV IVORY_VERSION 5.4
122+
ENV IVORY_VERSION 5.6
123123
ARG USE_CHINA_MIRROR=false
124124
RUN mkdir /docker-entrypoint-initdb.d
125125

‎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.4
22+
ENV IVORY_VERSION 5.6
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
@@ -90,7 +90,7 @@ COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/ivo
9090
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
9191

9292
ENV IVORY_MAJOR 5
93-
ENV IVORY_VERSION 5.4
93+
ENV IVORY_VERSION 5.6
9494

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

‎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.4"
4+
ARG FULL_VERSION="5.6"
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.4"
74+
ARG FULL_VERSION="5.6"
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.3-4.0.6-ubi8
3+
image: ivorysql/docker-compose-ha-cluster:5.6-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.3-4.0.6-ubi8
3+
image: ivorysql/docker-compose-ha-cluster:5.6-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.3-4.0.6-ubi8
3+
image: ivorysql/docker-compose-ha-cluster:5.6-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.3-4.0.6-ubi8
5+
image: ivorysql/docker-swarm-ha-cluster:5.6-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.3-4.0.6-ubi8
34+
image: ivorysql/docker-swarm-ha-cluster:5.6-4.0.6-ubi8
3535
environment:
3636
IVORYSQL_PASSWORD: 123456
3737
PATRONI_SCOPE: hgdb-cluster1

‎k8s-cluster/ha-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.4"
4+
ARG FULL_VERSION="5.6"
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.4"
74+
ARG FULL_VERSION="5.6"
7575

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ image:
2323
repository: ivorysql/k8s-ha-cluster
2424
pullPolicy: IfNotPresent
2525
# Overrides the image tag whose default is the chart appVersion.
26-
tag: "5.4-4.0.6-ubi8"
26+
tag: "5.6-4.0.6-ubi8"
2727

2828
imagePullSecrets: []
2929
nameOverride: ""

0 commit comments

Comments
 (0)