diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 6cea02b..24d8558 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -168,7 +168,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} builder: ${{ steps.buildx.outputs.name }} - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/riscv64 cache-from: type=gha cache-to: type=gha,mode=max file: Dockerfile diff --git a/Dockerfile b/Dockerfile index 4ea371e..bb24bcb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,18 @@ -FROM postgres:12.16-alpine3.18 - -RUN apk --no-cache add tzdata dos2unix +FROM xfan1024/openeuler:23.03-light +RUN mkdir /tools +WORKDIR /tools +# 安装依赖 +RUN yum -y install util-linux dos2unix gcc make unzip wget\ + && wget https://github.com/ncopa/su-exec/archive/master.zip\ + && unzip master.zip\ + && cd su-exec-master\ + && make\ + && cp su-exec /usr/local/bin/ + +RUN yum -y install postgresql postgresql-server \ + &&mkdir /data\ + &&chown -R postgres /data\ + &&chown -R postgres /tools ENV TZ=Asia/Shanghai @@ -11,5 +23,14 @@ COPY docker-entrypoint.sh /usr/local/bin RUN dos2unix -k /usr/local/bin/update-pg-password.sh /usr/local/bin/docker-entrypoint.sh /docker-entrypoint-initdb.d/10_eulixspace.sh RUN chmod +x /usr/local/bin/docker-entrypoint.sh -RUN chmod +x /usr/local/bin/update-pg-password.sh -RUN chmod +x /docker-entrypoint-initdb.d/10_eulixspace.sh \ No newline at end of file +RUN chmod 777 /usr/local/bin/update-pg-password.sh +RUN chmod +x /docker-entrypoint-initdb.d/10_eulixspace.sh +RUN chmod +x /usr/local/bin/su-exec + +RUN chown -R postgres /usr/local/bin/docker-entrypoint.sh +ENTRYPOINT ["docker-entrypoint.sh"] + +STOPSIGNAL SIGINT + +EXPOSE 5432 +CMD ["postgres"] \ No newline at end of file diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index ec6dda3..5a69f30 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -325,7 +325,7 @@ _main() { docker_setup_db docker_process_init_files /docker-entrypoint-initdb.d/* - + sed -i "s/^#listen_addresses =.*$/listen_addresses = '*'/" "$PGDATA/postgresql.conf" docker_temp_server_stop unset PGPASSWORD