Skip to content

Commit 4486a31

Browse files
balinorLiangbalinorLiang
committed
IvorySQL v5.0 release for docker library
1 parent 87343f2 commit 4486a31

27 files changed

+2180
-380
lines changed

‎1/trixie/Dockerfile‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,16 @@ RUN chmod +x /usr/local/bin/gosu
112112

113113
FROM debian:trixie-slim
114114

115-
COPY --from=builder /var/local/ivorysql /var/local/ivorysql/
116-
COPY --from=builder /usr/local/bin/gosu /usr/local/bin/gosu
115+
RUN useradd -u 1000 ivorysql
116+
117+
COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/ivorysql/
118+
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
117119

118120
ENV IVORY_MAJOR 1
119121
ENV IVORY_VERSION 1.17
120122
ARG USE_CHINA_MIRROR=false
121123
RUN mkdir /docker-entrypoint-initdb.d
122124

123-
RUN useradd -u 1000 ivorysql
124-
125125
# Use China mirror if specified
126126
RUN if [ "$USE_CHINA_MIRROR" = "true" ]; then \
127127
sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources ;\
@@ -137,13 +137,11 @@ RUN apt-get update && \
137137
libldap2 \
138138
libldap2-dev \
139139
libreadline-dev \
140-
libicu-dev && \
140+
libicu-dev \
141+
libossp-uuid-dev && \
141142
apt-get clean
142143

143144

144-
RUN chown -R ivorysql:ivorysql /var/local/ivorysql
145-
RUN chown -R ivorysql:ivorysql /usr/local/bin
146-
147145
ENV PGDATA /var/local/ivorysql/ivorysql-$IVORY_MAJOR/data
148146

149147
# this 1777 will be replaced by 0700 at runtime (allows semi-arbitrary "--user" values)

‎3/bookworm/Dockerfile‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,16 @@ RUN chmod +x /usr/local/bin/gosu
112112

113113
FROM debian:bookworm-slim
114114

115-
COPY --from=builder /var/local/ivorysql /var/local/ivorysql/
116-
COPY --from=builder /usr/local/bin/gosu /usr/local/bin/gosu
115+
RUN useradd -u 1000 ivorysql
116+
117+
COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/ivorysql/
118+
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
117119

118120
ENV IVORY_MAJOR 3
119121
ENV IVORY_VERSION 3.4
120122
ARG USE_CHINA_MIRROR=false
121123
RUN mkdir /docker-entrypoint-initdb.d
122124

123-
RUN useradd -u 1000 ivorysql
124-
125125
# Use China mirror if specified
126126
RUN if [ "$USE_CHINA_MIRROR" = "true" ]; then \
127127
sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources ;\
@@ -137,13 +137,11 @@ RUN apt-get update && \
137137
libldap-2.5-0 \
138138
libldap2-dev \
139139
libreadline-dev \
140-
libicu-dev && \
140+
libicu-dev \
141+
libossp-uuid-dev && \
141142
apt-get clean
142143

143144

144-
RUN chown -R ivorysql:ivorysql /var/local/ivorysql
145-
RUN chown -R ivorysql:ivorysql /usr/local/bin
146-
147145
ENV PGDATA /var/local/ivorysql/ivorysql-$IVORY_MAJOR/data
148146

149147
# this 1777 will be replaced by 0700 at runtime (allows semi-arbitrary "--user" values)

‎3/trixie/Dockerfile‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,16 @@ RUN chmod +x /usr/local/bin/gosu
112112

113113
FROM debian:trixie-slim
114114

115-
COPY --from=builder /var/local/ivorysql /var/local/ivorysql/
116-
COPY --from=builder /usr/local/bin/gosu /usr/local/bin/gosu
115+
RUN useradd -u 1000 ivorysql
116+
117+
COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/ivorysql/
118+
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
117119

118120
ENV IVORY_MAJOR 3
119121
ENV IVORY_VERSION 3.4
120122
ARG USE_CHINA_MIRROR=false
121123
RUN mkdir /docker-entrypoint-initdb.d
122124

123-
RUN useradd -u 1000 ivorysql
124-
125125
# Use China mirror if specified
126126
RUN if [ "$USE_CHINA_MIRROR" = "true" ]; then \
127127
sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources ;\
@@ -137,13 +137,11 @@ RUN apt-get update && \
137137
libldap2 \
138138
libldap2-dev \
139139
libreadline-dev \
140-
libicu-dev && \
140+
libicu-dev \
141+
libossp-uuid-dev && \
141142
apt-get clean
142143

143144

144-
RUN chown -R ivorysql:ivorysql /var/local/ivorysql
145-
RUN chown -R ivorysql:ivorysql /usr/local/bin
146-
147145
ENV PGDATA /var/local/ivorysql/ivorysql-$IVORY_MAJOR/data
148146

149147
# this 1777 will be replaced by 0700 at runtime (allows semi-arbitrary "--user" values)

‎3/ubi8/Dockerfile‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,24 @@ RUN ARCH="$(uname -m)"; \
8383

8484
FROM redhat/ubi8:latest
8585

86-
COPY --from=builder /var/local/ivorysql /var/local/ivorysql/
87-
COPY --from=builder /usr/local/bin/gosu /usr/local/bin/gosu
86+
RUN useradd -u 1000 ivorysql
87+
88+
COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/ivorysql
89+
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
8890

8991
ENV IVORY_MAJOR 3
9092
ENV IVORY_VERSION 3.4
9193

9294
RUN mkdir /docker-entrypoint-initdb.d
9395

94-
RUN useradd -u 1000 ivorysql
95-
96-
RUN dnf install -y \
97-
lz4 lz4-devel lz4-libs krb5-devel libxslt-devel libicu-devel && dnf -y clean all
96+
RUN curl -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Centos-8.repo; \
97+
sed -i -e '/mirrors.cloud.aliyuncs.com/d' -e '/mirrors.aliyuncs.com/d' /etc/yum.repos.d/CentOS-Base.repo
9898

99-
RUN chown -R ivorysql:ivorysql /var/local/ivorysql
100-
RUN chown -R ivorysql:ivorysql /usr/local/bin
99+
RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm; \
100+
dnf install -y lz4 lz4-devel lz4-libs krb5-devel libxslt-devel libicu-devel; \
101+
dnf install -y e2fsprogs-devel libuuid-devel;\
102+
dnf install -y --enablerepo=*ower*ools uuid-devel;\
103+
dnf -y clean all
101104

102105
ENV PGDATA /var/local/ivorysql/ivorysql-$IVORY_MAJOR/data
103106
# this 1777 will be replaced by 0700 at runtime (allows semi-arbitrary "--user" values)

‎4/bookworm/Dockerfile‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,16 @@ RUN chmod +x /usr/local/bin/gosu
112112

113113
FROM debian:bookworm-slim
114114

115-
COPY --from=builder /var/local/ivorysql /var/local/ivorysql/
116-
COPY --from=builder /usr/local/bin/gosu /usr/local/bin/gosu
115+
RUN useradd -u 1000 ivorysql
116+
117+
COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/ivorysql/
118+
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
117119

118120
ENV IVORY_MAJOR 4
119121
ENV IVORY_VERSION 4.6
120122
ARG USE_CHINA_MIRROR=false
121123
RUN mkdir /docker-entrypoint-initdb.d
122124

123-
RUN useradd -u 1000 ivorysql
124-
125125
# Use China mirror if specified
126126
RUN if [ "$USE_CHINA_MIRROR" = "true" ]; then \
127127
sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources ;\
@@ -137,13 +137,11 @@ RUN apt-get update && \
137137
libldap-2.5-0 \
138138
libldap2-dev \
139139
libreadline-dev \
140-
libicu-dev && \
140+
libicu-dev \
141+
libossp-uuid-dev && \
141142
apt-get clean
142143

143144

144-
RUN chown -R ivorysql:ivorysql /var/local/ivorysql
145-
RUN chown -R ivorysql:ivorysql /usr/local/bin
146-
147145
ENV PGDATA /var/local/ivorysql/ivorysql-$IVORY_MAJOR/data
148146

149147
# this 1777 will be replaced by 0700 at runtime (allows semi-arbitrary "--user" values)

‎4/trixie/Dockerfile‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,16 @@ RUN chmod +x /usr/local/bin/gosu
112112

113113
FROM debian:trixie-slim
114114

115-
COPY --from=builder /var/local/ivorysql /var/local/ivorysql/
116-
COPY --from=builder /usr/local/bin/gosu /usr/local/bin/gosu
115+
RUN useradd -u 1000 ivorysql
116+
117+
COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/ivorysql/
118+
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
117119

118120
ENV IVORY_MAJOR 4
119121
ENV IVORY_VERSION 4.6
120122
ARG USE_CHINA_MIRROR=false
121123
RUN mkdir /docker-entrypoint-initdb.d
122124

123-
RUN useradd -u 1000 ivorysql
124-
125125
# Use China mirror if specified
126126
RUN if [ "$USE_CHINA_MIRROR" = "true" ]; then \
127127
sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources ;\
@@ -137,13 +137,11 @@ RUN apt-get update && \
137137
libldap2 \
138138
libldap2-dev \
139139
libreadline-dev \
140-
libicu-dev && \
140+
libicu-dev \
141+
libossp-uuid-dev && \
141142
apt-get clean
142143

143144

144-
RUN chown -R ivorysql:ivorysql /var/local/ivorysql
145-
RUN chown -R ivorysql:ivorysql /usr/local/bin
146-
147145
ENV PGDATA /var/local/ivorysql/ivorysql-$IVORY_MAJOR/data
148146

149147
# this 1777 will be replaced by 0700 at runtime (allows semi-arbitrary "--user" values)

‎4/ubi8/Dockerfile‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,24 @@ RUN ARCH="$(uname -m)"; \
8383

8484
FROM redhat/ubi8:latest
8585

86-
COPY --from=builder /var/local/ivorysql /var/local/ivorysql/
87-
COPY --from=builder /usr/local/bin/gosu /usr/local/bin/gosu
86+
RUN useradd -u 1000 ivorysql
87+
88+
COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/ivorysql
89+
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
8890

8991
ENV IVORY_MAJOR 4
9092
ENV IVORY_VERSION 4.6
9193

9294
RUN mkdir /docker-entrypoint-initdb.d
9395

94-
RUN useradd -u 1000 ivorysql
95-
96-
RUN dnf install -y \
97-
lz4 lz4-devel lz4-libs krb5-devel libxslt-devel libicu-devel && dnf -y clean all
96+
RUN curl -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Centos-8.repo; \
97+
sed -i -e '/mirrors.cloud.aliyuncs.com/d' -e '/mirrors.aliyuncs.com/d' /etc/yum.repos.d/CentOS-Base.repo
9898

99-
RUN chown -R ivorysql:ivorysql /var/local/ivorysql
100-
RUN chown -R ivorysql:ivorysql /usr/local/bin
99+
RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm; \
100+
dnf install -y lz4 lz4-devel lz4-libs krb5-devel libxslt-devel libicu-devel; \
101+
dnf install -y e2fsprogs-devel libuuid-devel;\
102+
dnf install -y --enablerepo=*ower*ools uuid-devel;\
103+
dnf -y clean all
101104

102105
ENV PGDATA /var/local/ivorysql/ivorysql-$IVORY_MAJOR/data
103106
# this 1777 will be replaced by 0700 at runtime (allows semi-arbitrary "--user" values)

0 commit comments

Comments
 (0)