This is an automated email from the ASF dual-hosted git repository.
yzheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new d81eadd1 Fix inconsistent image build issue (#1010)
d81eadd1 is described below
commit d81eadd1a9ada709ecafcec9897dad4d5012614b
Author: MonkeyCanCode <[email protected]>
AuthorDate: Tue Feb 18 10:06:19 2025 -0600
Fix inconsistent image build issue (#1010)
* fix inconsistent image build issue
* Add clean and no-build-cache for image build commands
---
README.md | 2 +-
getting-started/eclipselink/README.md | 5 +++--
getting-started/spark/README.md | 2 +-
getting-started/telemetry/README.md | 2 +-
getting-started/trino/README.md | 2 +-
helm/polaris/README.md | 5 +++--
helm/polaris/README.md.gotmpl | 5 +++--
quarkus/admin/README.md | 2 +-
quarkus/server/README.md | 7 ++++---
regtests/README.md | 2 +-
run.sh | 5 +++--
site/content/in-dev/unreleased/admin-tool.md | 3 ++-
site/content/in-dev/unreleased/quickstart.md | 2 +-
13 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
index e1155c37..89db1463 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ select * from db1.table1;
#### Running in Docker
-- `./gradlew clean :polaris-quarkus-server:assemble
-Dquarkus.container-image.build=true` - To
+- `./gradlew clean :polaris-quarkus-server:assemble
-Dquarkus.container-image.build=true --no-build-cache` - To
build the image locally.
- `docker run -p 8181:8181 -p 8182:8182 apache/polaris:latest` - To run the
image.
diff --git a/getting-started/eclipselink/README.md
b/getting-started/eclipselink/README.md
index 793b7e96..53618b41 100644
--- a/getting-started/eclipselink/README.md
+++ b/getting-started/eclipselink/README.md
@@ -25,10 +25,11 @@ This example requires `jq` to be installed on your machine.
the Postgres JDBC driver:
```shell
- ./gradlew :polaris-quarkus-server:assemble :polaris-quarkus-admin:assemble
\
+ ./gradlew clean :polaris-quarkus-server:assemble
:polaris-quarkus-admin:assemble \
-PeclipseLinkDeps=org.postgresql:postgresql:42.7.4 \
-Dquarkus.container-image.tag=postgres-latest \
- -Dquarkus.container-image.build=true
+ -Dquarkus.container-image.build=true \
+ --no-build-cache
```
2. Start the docker compose group by running the following command from the
root of the repository:
diff --git a/getting-started/spark/README.md b/getting-started/spark/README.md
index 793fbf05..b5239561 100644
--- a/getting-started/spark/README.md
+++ b/getting-started/spark/README.md
@@ -27,7 +27,7 @@ A Jupyter notebook is used to run PySpark.
If a Polaris image is not already present locally, build one with the
following command:
```shell
-./gradlew clean :polaris-quarkus-server:assemble
-Dquarkus.container-image.build=true
+./gradlew clean :polaris-quarkus-server:assemble
-Dquarkus.container-image.build=true --no-build-cache
```
## Run the `docker-compose` file
diff --git a/getting-started/telemetry/README.md
b/getting-started/telemetry/README.md
index a956d606..9e07f0ca 100644
--- a/getting-started/telemetry/README.md
+++ b/getting-started/telemetry/README.md
@@ -24,7 +24,7 @@ This example requires `jq` to be installed on your machine.
1. Build the Polaris image if it's not already present locally:
```shell
- ./gradlew clean :polaris-quarkus-server:assemble
-Dquarkus.container-image.build=true
+ ./gradlew clean :polaris-quarkus-server:assemble
-Dquarkus.container-image.build=true --no-build-cache
```
2. Start the docker compose group by running the following command from the
root of the repository:
diff --git a/getting-started/trino/README.md b/getting-started/trino/README.md
index 957604b3..ec1f4ecd 100644
--- a/getting-started/trino/README.md
+++ b/getting-started/trino/README.md
@@ -24,7 +24,7 @@ This getting started guide provides a `docker-compose` file
to set up [Trino](ht
## Build Polaris Image
Build Polaris Image while Docker is running
```
-./gradlew :polaris-quarkus-server:assemble -Dquarkus.container-image.build=true
+./gradlew clean :polaris-quarkus-server:assemble
-Dquarkus.container-image.build=true --no-build-cache
```
## Run the `docker-compose` file
diff --git a/helm/polaris/README.md b/helm/polaris/README.md
index 237e3c1c..9ac6eb43 100644
--- a/helm/polaris/README.md
+++ b/helm/polaris/README.md
@@ -86,9 +86,10 @@ If necessary, build and load the Docker images with support
for Postgres into Mi
```bash
eval $(minikube -p minikube docker-env)
-./gradlew :polaris-quarkus-server:assemble :polaris-quarkus-admin:assemble \
+./gradlew clean :polaris-quarkus-server:assemble
:polaris-quarkus-admin:assemble \
-Dquarkus.container-image.build=true \
- -PeclipseLinkDeps=org.postgresql:postgresql:42.7.4
+ -PeclipseLinkDeps=org.postgresql:postgresql:42.7.4 \
+ --no-build-cache
```
### Installing the chart locally
diff --git a/helm/polaris/README.md.gotmpl b/helm/polaris/README.md.gotmpl
index 45a4ca54..d443c62f 100644
--- a/helm/polaris/README.md.gotmpl
+++ b/helm/polaris/README.md.gotmpl
@@ -87,9 +87,10 @@ If necessary, build and load the Docker images with support
for Postgres into Mi
```bash
eval $(minikube -p minikube docker-env)
-./gradlew :polaris-quarkus-server:assemble :polaris-quarkus-admin:assemble \
+./gradlew clean :polaris-quarkus-server:assemble
:polaris-quarkus-admin:assemble \
-Dquarkus.container-image.build=true \
- -PeclipseLinkDeps=org.postgresql:postgresql:42.7.4
+ -PeclipseLinkDeps=org.postgresql:postgresql:42.7.4 \
+ --no-build-cache
```
### Installing the chart locally
diff --git a/quarkus/admin/README.md b/quarkus/admin/README.md
index 1499dc95..2ae9c788 100644
--- a/quarkus/admin/README.md
+++ b/quarkus/admin/README.md
@@ -28,7 +28,7 @@ java -jar polaris-quarkus-admin-<version>-runner.jar
To also build the Docker image, you can use the following command:
```shell
-./gradlew :polaris-quarkus-admin:assemble -Dquarkus.container-image.build=true
+./gradlew clean :polaris-quarkus-admin:assemble
-Dquarkus.container-image.build=true --no-build-cache
```
## Running the Admin Tool
diff --git a/quarkus/server/README.md b/quarkus/server/README.md
index aade36e8..ef66d361 100644
--- a/quarkus/server/README.md
+++ b/quarkus/server/README.md
@@ -27,15 +27,16 @@ To also build the Docker image, you can use the following
command (a running Doc
required):
```shell
-./gradlew :polaris-quarkus-server:assemble -Dquarkus.container-image.build=true
+./gradlew clean :polaris-quarkus-server:assemble
-Dquarkus.container-image.build=true --no-build-cache
```
If you need to customize the Docker image, for example to push to a local
registry, you can use the
following command:
```shell
-./gradlew :polaris-quarkus-server:build -Dquarkus.container-image.build=true \
+./gradlew clean :polaris-quarkus-server:build
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.registry=localhost:5001 \
-Dquarkus.container-image.group=apache \
- -Dquarkus.container-image.name=polaris-local
+ -Dquarkus.container-image.name=polaris-local \
+ --no-build-cache
```
\ No newline at end of file
diff --git a/regtests/README.md b/regtests/README.md
index 648255d4..4c2d5c55 100644
--- a/regtests/README.md
+++ b/regtests/README.md
@@ -39,7 +39,7 @@ Tests can be run with docker-compose using the provided
`./regtests/docker-compo
follows:
```shell
-./gradlew :polaris-quarkus-server:assemble -Dquarkus.container-image.build=true
+./gradlew clean :polaris-quarkus-server:assemble
-Dquarkus.container-image.build=true --no-build-cache
docker compose -f ./regtests/docker-compose.yml up --build --exit-code-from
regtest
```
diff --git a/run.sh b/run.sh
index 088cfd7b..0ddd649e 100755
--- a/run.sh
+++ b/run.sh
@@ -52,9 +52,10 @@ sh ./kind-registry.sh
# Build and deploy the server image
echo "Building polaris image..."
-./gradlew :polaris-quarkus-server:build $ECLIPSE_LINK_DEPS \
+./gradlew clean :polaris-quarkus-server:build $ECLIPSE_LINK_DEPS \
-Dquarkus.container-image.build=true \
- -Dquarkus.container-image.registry=localhost:5001
+ -Dquarkus.container-image.registry=localhost:5001 \
+ --no-build-cache
echo "Pushing polaris image..."
docker push localhost:5001/apache/polaris
diff --git a/site/content/in-dev/unreleased/admin-tool.md
b/site/content/in-dev/unreleased/admin-tool.md
index 52223afc..54d2c715 100644
--- a/site/content/in-dev/unreleased/admin-tool.md
+++ b/site/content/in-dev/unreleased/admin-tool.md
@@ -30,7 +30,8 @@ example, to build the tool with support for Postgres, run the
following:
```shell
./gradlew clean :polaris-quarkus-admin:build \
-Dquarkus.container-image.build=true \
- -PeclipseLinkDeps=org.postgresql:postgresql:42.7.4
+ -PeclipseLinkDeps=org.postgresql:postgresql:42.7.4 \
+ --no-build-cache
```
The above command will generate:
diff --git a/site/content/in-dev/unreleased/quickstart.md
b/site/content/in-dev/unreleased/quickstart.md
index 26c69503..d9a97a3d 100644
--- a/site/content/in-dev/unreleased/quickstart.md
+++ b/site/content/in-dev/unreleased/quickstart.md
@@ -105,7 +105,7 @@ To start using Polaris in Docker, launch Polaris while
Docker is running:
```shell
cd ~/polaris
-./gradlew clean :polaris-quarkus-server:assemble
-Dquarkus.container-image.build=true
+./gradlew clean :polaris-quarkus-server:assemble
-Dquarkus.container-image.build=true --no-build-cache
docker run -p 8181:8181 -p 8182:8182 apache/polaris:latest
```
