From 35773c7ad3709532434266caaab522f720f3d128 Mon Sep 17 00:00:00 2001 From: "Alex.Bob" Date: Thu, 12 Dec 2024 19:35:59 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20chore(`Dockerfiles`):=20Remove?= =?UTF-8?q?=20outdated=20Dockerfiles=20for=20versions=2015,=2016,=20and=20?= =?UTF-8?q?17.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/postgres-build.yml | 6 ++++-- 15/Dockerfile | 8 ------- 15/postgis/Dockerfile | 31 ---------------------------- 15/zhparser/Dockerfile | 30 --------------------------- 16/Dockerfile | 8 ------- 16/postgis/Dockerfile | 31 ---------------------------- 16/zhparser/Dockerfile | 30 --------------------------- 17/Dockerfile | 8 ------- 17/postgis/Dockerfile | 31 ---------------------------- 17/zhparser/Dockerfile | 30 --------------------------- 10 files changed, 4 insertions(+), 209 deletions(-) delete mode 100644 15/Dockerfile delete mode 100644 15/postgis/Dockerfile delete mode 100644 15/zhparser/Dockerfile delete mode 100644 16/Dockerfile delete mode 100644 16/postgis/Dockerfile delete mode 100644 16/zhparser/Dockerfile delete mode 100644 17/Dockerfile delete mode 100644 17/postgis/Dockerfile delete mode 100644 17/zhparser/Dockerfile diff --git a/.github/workflows/postgres-build.yml b/.github/workflows/postgres-build.yml index 217c5cc..ba43a41 100644 --- a/.github/workflows/postgres-build.yml +++ b/.github/workflows/postgres-build.yml @@ -7,10 +7,12 @@ name: Postgresql Build run-name: ${{ github.actor }} is Build Postgresql Actions on: + schedule: + - cron: "0 10 * * *" push: - branches: [ "main","dev" ] + branches: [ "main","15","16"] tags: - - "v*.*.*" + - "v*" pull_request: env: # Use docker.io for Docker Hub if empty diff --git a/15/Dockerfile b/15/Dockerfile deleted file mode 100644 index ad0893c..0000000 --- a/15/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM postgres:15 - -# 设置时区 -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 -RUN localedef -i zh_HK -c -f UTF-8 -A /usr/share/locale/locale.alias zh_HK.UTF-8 -RUN localedef -i zh_TW -c -f UTF-8 -A /usr/share/locale/locale.alias zh_TW.UTF-8 -ENV LANG=zh_CN.utf8 diff --git a/15/postgis/Dockerfile b/15/postgis/Dockerfile deleted file mode 100644 index 1a423b7..0000000 --- a/15/postgis/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -ARG PG_CONTAINER_VERSION=15 -FROM postgis/postgis:${PG_CONTAINER_VERSION}-master AS builder - -ARG DEBIAN_FRONTEND=noninteractive -RUN set -ex \ - && apt-get update \ - && apt-get install -y build-essential git postgresql-server-dev-${PG_MAJOR} pkg-config binutils automake libtool \ - && apt-get clean - -RUN set -ex \ - && git clone --branch 1.2.3 --single-branch --depth 1 https://github.com/hightman/scws.git \ - && cd scws \ - && touch README;aclocal;autoconf;autoheader;libtoolize;automake --add-missing \ - && ./configure \ - && make install - -RUN set -ex \ - && git clone --branch master --single-branch --depth 1 https://github.com/amutu/zhparser.git \ - && cd zhparser \ - && make install - -FROM postgis/postgis:${PG_CONTAINER_VERSION}-master -RUN localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 -ENV LANG=zh_CN.UTF-8 - -COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/ -COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/ -COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/ -COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/ -COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/*.utf8.* /usr/share/postgresql/${PG_MAJOR}/tsearch_data/ - diff --git a/15/zhparser/Dockerfile b/15/zhparser/Dockerfile deleted file mode 100644 index a450739..0000000 --- a/15/zhparser/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -ARG PG_CONTAINER_VERSION=15 -FROM docker.io/library/postgres:${PG_CONTAINER_VERSION}-bookworm AS builder - -ARG DEBIAN_FRONTEND=noninteractive -RUN set -ex \ - && apt-get update \ - && apt-get install -y build-essential git postgresql-server-dev-${PG_MAJOR} pkg-config binutils automake libtool \ - && apt-get clean - -RUN set -ex \ - && git clone --branch 1.2.3 --single-branch --depth 1 https://github.com/hightman/scws.git \ - && cd scws \ - && touch README;aclocal;autoconf;autoheader;libtoolize;automake --add-missing \ - && ./configure \ - && make install - -RUN set -ex \ - && git clone --branch master --single-branch --depth 1 https://github.com/amutu/zhparser.git \ - && cd zhparser \ - && make install - -FROM docker.io/library/postgres:${PG_CONTAINER_VERSION}-bookworm -RUN localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 -ENV LANG=zh_CN.UTF-8 - -COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/ -COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/ -COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/ -COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/ -COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/*.utf8.* /usr/share/postgresql/${PG_MAJOR}/tsearch_data/ \ No newline at end of file diff --git a/16/Dockerfile b/16/Dockerfile deleted file mode 100644 index d0ecbc9..0000000 --- a/16/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM postgres:16 - -# 设置时区 -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 -RUN localedef -i zh_HK -c -f UTF-8 -A /usr/share/locale/locale.alias zh_HK.UTF-8 -RUN localedef -i zh_TW -c -f UTF-8 -A /usr/share/locale/locale.alias zh_TW.UTF-8 -ENV LANG=zh_CN.utf8 diff --git a/16/postgis/Dockerfile b/16/postgis/Dockerfile deleted file mode 100644 index d63f421..0000000 --- a/16/postgis/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -ARG PG_CONTAINER_VERSION=16 -FROM postgis/postgis:${PG_CONTAINER_VERSION}-master AS builder - -ARG DEBIAN_FRONTEND=noninteractive -RUN set -ex \ - && apt-get update \ - && apt-get install -y build-essential git postgresql-server-dev-${PG_MAJOR} pkg-config binutils automake libtool \ - && apt-get clean - -RUN set -ex \ - && git clone --branch 1.2.3 --single-branch --depth 1 https://github.com/hightman/scws.git \ - && cd scws \ - && touch README;aclocal;autoconf;autoheader;libtoolize;automake --add-missing \ - && ./configure \ - && make install - -RUN set -ex \ - && git clone --branch master --single-branch --depth 1 https://github.com/amutu/zhparser.git \ - && cd zhparser \ - && make install - -FROM postgis/postgis:${PG_CONTAINER_VERSION}-master -RUN localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 -ENV LANG=zh_CN.UTF-8 - -COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/ -COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/ -COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/ -COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/ -COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/*.utf8.* /usr/share/postgresql/${PG_MAJOR}/tsearch_data/ - diff --git a/16/zhparser/Dockerfile b/16/zhparser/Dockerfile deleted file mode 100644 index 35f06c4..0000000 --- a/16/zhparser/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -ARG PG_CONTAINER_VERSION=16 -FROM docker.io/library/postgres:${PG_CONTAINER_VERSION}-bookworm AS builder - -ARG DEBIAN_FRONTEND=noninteractive -RUN set -ex \ - && apt-get update \ - && apt-get install -y build-essential git postgresql-server-dev-${PG_MAJOR} pkg-config binutils automake libtool \ - && apt-get clean - -RUN set -ex \ - && git clone --branch 1.2.3 --single-branch --depth 1 https://github.com/hightman/scws.git \ - && cd scws \ - && touch README;aclocal;autoconf;autoheader;libtoolize;automake --add-missing \ - && ./configure \ - && make install - -RUN set -ex \ - && git clone --branch master --single-branch --depth 1 https://github.com/amutu/zhparser.git \ - && cd zhparser \ - && make install - -FROM docker.io/library/postgres:${PG_CONTAINER_VERSION}-bookworm -RUN localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 -ENV LANG=zh_CN.UTF-8 - -COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/ -COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/ -COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/ -COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/ -COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/*.utf8.* /usr/share/postgresql/${PG_MAJOR}/tsearch_data/ \ No newline at end of file diff --git a/17/Dockerfile b/17/Dockerfile deleted file mode 100644 index ba20599..0000000 --- a/17/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM postgres:17 - -# 设置时区 -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 -RUN localedef -i zh_HK -c -f UTF-8 -A /usr/share/locale/locale.alias zh_HK.UTF-8 -RUN localedef -i zh_TW -c -f UTF-8 -A /usr/share/locale/locale.alias zh_TW.UTF-8 -ENV LANG=zh_CN.utf8 diff --git a/17/postgis/Dockerfile b/17/postgis/Dockerfile deleted file mode 100644 index df12601..0000000 --- a/17/postgis/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -ARG PG_CONTAINER_VERSION=17 -FROM postgis/postgis:${PG_CONTAINER_VERSION}-master AS builder - -ARG DEBIAN_FRONTEND=noninteractive -RUN set -ex \ - && apt-get update \ - && apt-get install -y build-essential git postgresql-server-dev-${PG_MAJOR} pkg-config binutils automake libtool \ - && apt-get clean - -RUN set -ex \ - && git clone --branch 1.2.3 --single-branch --depth 1 https://github.com/hightman/scws.git \ - && cd scws \ - && touch README;aclocal;autoconf;autoheader;libtoolize;automake --add-missing \ - && ./configure \ - && make install - -RUN set -ex \ - && git clone --branch master --single-branch --depth 1 https://github.com/amutu/zhparser.git \ - && cd zhparser \ - && make install - -FROM postgis/postgis:${PG_CONTAINER_VERSION}-master -RUN localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 -ENV LANG=zh_CN.UTF-8 - -COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/ -COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/ -COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/ -COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/ -COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/*.utf8.* /usr/share/postgresql/${PG_MAJOR}/tsearch_data/ - diff --git a/17/zhparser/Dockerfile b/17/zhparser/Dockerfile deleted file mode 100644 index 7aedb54..0000000 --- a/17/zhparser/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -ARG PG_CONTAINER_VERSION=17 -FROM docker.io/library/postgres:${PG_CONTAINER_VERSION}-bookworm AS builder - -ARG DEBIAN_FRONTEND=noninteractive -RUN set -ex \ - && apt-get update \ - && apt-get install -y build-essential git postgresql-server-dev-${PG_MAJOR} pkg-config binutils automake libtool \ - && apt-get clean - -RUN set -ex \ - && git clone --branch 1.2.3 --single-branch --depth 1 https://github.com/hightman/scws.git \ - && cd scws \ - && touch README;aclocal;autoconf;autoheader;libtoolize;automake --add-missing \ - && ./configure \ - && make install - -RUN set -ex \ - && git clone --branch master --single-branch --depth 1 https://github.com/amutu/zhparser.git \ - && cd zhparser \ - && make install - -FROM docker.io/library/postgres:${PG_CONTAINER_VERSION}-bookworm -RUN localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 -ENV LANG=zh_CN.UTF-8 - -COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/ -COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/ -COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/ -COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/ -COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/*.utf8.* /usr/share/postgresql/${PG_MAJOR}/tsearch_data/ \ No newline at end of file