diff --git a/.github/workflows/manual-build-pr-docker-image.yml b/.github/workflows/manual-build-pr-docker-image.yml index c5bf6ba271..0da332c5ca 100644 --- a/.github/workflows/manual-build-pr-docker-image.yml +++ b/.github/workflows/manual-build-pr-docker-image.yml @@ -44,7 +44,7 @@ jobs: uses: docker/build-push-action@v3 with: context: . - file: Dockerfile + file: Dockerfile.pro build-args: | VERDACCIO_URL=http://localhost:4873/ COMMIT_HASH=${GITHUB_SHA} diff --git a/.github/workflows/manual-build-pro-image.yml b/.github/workflows/manual-build-pro-image.yml index 4736fd5aab..f440667bf5 100644 --- a/.github/workflows/manual-build-pro-image.yml +++ b/.github/workflows/manual-build-pro-image.yml @@ -122,7 +122,7 @@ jobs: uses: docker/build-push-action@v3 with: context: . - file: Dockerfile + file: Dockerfile.pro build-args: | VERDACCIO_URL=http://localhost:4873/ COMMIT_HASH=${GITHUB_SHA} diff --git a/.github/workflows/manual-build-pro-plugin-image.yml b/.github/workflows/manual-build-pro-plugin-image.yml index 3f304ada23..9ca74d906a 100644 --- a/.github/workflows/manual-build-pro-plugin-image.yml +++ b/.github/workflows/manual-build-pro-plugin-image.yml @@ -107,7 +107,7 @@ jobs: uses: docker/build-push-action@v3 with: context: . - file: Dockerfile + file: Dockerfile.pro build-args: | VERDACCIO_URL=http://localhost:4873/ COMMIT_HASH=${GITHUB_SHA} diff --git a/Dockerfile.pro b/Dockerfile.pro index cb4d035223..13302fd5db 100644 --- a/Dockerfile.pro +++ b/Dockerfile.pro @@ -54,7 +54,7 @@ RUN mkdir -p /app/nocobase/storage/uploads/ && echo "$COMMIT_HASH" >> /app/nocob # install postgresql-client and mysql-client RUN apt update && apt install -y wget postgresql-common gnupg \ && /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y \ - && apt install -y postgresql-client-16 \ + && apt install -y postgresql-client-17 \ && wget https://downloads.mysql.com/archives/get/p/23/file/mysql-community-client-core_8.1.0-1debian11_amd64.deb \ && dpkg -x mysql-community-client-core_8.1.0-1debian11_amd64.deb /tmp/mysql-client \ && cp /tmp/mysql-client/usr/bin/mysqldump /usr/bin/ \