From 6aba822b33b077f794cf97f5e93bb4c91ea4c61c Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Tue, 28 Nov 2023 10:26:34 +0200 Subject: [PATCH] fix --- docs/src/guides/languages/postgresql.md | 4 ++-- docs/src/guides/languages/python.md | 4 ++-- earthly/docs/Earthfile | 2 +- earthly/postgresql/Earthfile | 2 +- earthly/python/Earthfile | 2 +- earthly/rust/Earthfile | 2 +- examples/postgresql/Earthfile | 2 +- examples/python/Earthfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/src/guides/languages/postgresql.md b/docs/src/guides/languages/postgresql.md index 6a585e899..793865e29 100644 --- a/docs/src/guides/languages/postgresql.md +++ b/docs/src/guides/languages/postgresql.md @@ -57,12 +57,12 @@ builder: WORKDIR /build COPY --dir ./migrations ./data ./refinery.toml . - DO ./../../earthly/postgresql+SETUP + DO ./../../earthly/postgresql+BUILDER ``` The first target we are going to consider will be responsible to prepare a PostgreSQL environment (Earthly `+postgres-base` target), migrations, migrations configuration and seed data (`COPY --dir ./migrations ./data ./refinery.toml .`), -doing some final build step (Earthly `+SETUP` UDC target). +doing some final build step (Earthly `+BUILDER` UDC target). In the next steps we are going to inheriting from this `+builder` target which contains all necessary data, dependencies, environment to properly run PostgreSQL database. diff --git a/docs/src/guides/languages/python.md b/docs/src/guides/languages/python.md index 30b4405bd..40c986516 100644 --- a/docs/src/guides/languages/python.md +++ b/docs/src/guides/languages/python.md @@ -51,7 +51,7 @@ builder: FROM ./../../earthly/python+python-base COPY --dir ./src . - DO ./../../earthly/python+SETUP + DO ./../../earthly/python+BUILDER ``` The first target `builder` is responsible to prepare an already configured Python environment, @@ -62,7 +62,7 @@ so it is mandatory to have `pyproject.toml` and `poetry.lock` files in the root The fist step of the `builder` target is prepare a Python environment with poetry via `+python-base` target. Next step is to copy source code of the project and finally finalize the build -with some poetry project setup which is done with `+SETUP` UDC target. +with some poetry project setup which is done with `+BUILDER` UDC target. ### Running checks diff --git a/earthly/docs/Earthfile b/earthly/docs/Earthfile index 377eb59ff..024c4554d 100644 --- a/earthly/docs/Earthfile +++ b/earthly/docs/Earthfile @@ -33,7 +33,7 @@ deps: git # Install poetry and our python dependencies. - DO ../python+SETUP + DO ../python+BUILDER # Copy our run scripts COPY --dir scripts /scripts diff --git a/earthly/postgresql/Earthfile b/earthly/postgresql/Earthfile index b582c0bb1..1e4bb4520 100644 --- a/earthly/postgresql/Earthfile +++ b/earthly/postgresql/Earthfile @@ -41,7 +41,7 @@ sqlfluff-image: # Common PostgreSQL setup. # Prepare important files needed for building image -SETUP: +BUILDER: COMMAND RUN cp /root/.sqlfluff . diff --git a/earthly/python/Earthfile b/earthly/python/Earthfile index 5c8c94938..9f2160698 100644 --- a/earthly/python/Earthfile +++ b/earthly/python/Earthfile @@ -32,7 +32,7 @@ python-base: # Common python builder setup. # Parameters: # opts : Options passed to the `poetry install` command. -SETUP: +BUILDER: COMMAND ARG opts diff --git a/earthly/rust/Earthfile b/earthly/rust/Earthfile index ac74fe506..7f13fd56b 100644 --- a/earthly/rust/Earthfile +++ b/earthly/rust/Earthfile @@ -8,7 +8,7 @@ VERSION 0.7 rust-base: # This is our base Host toolset, and rustup. # The ACTUAL version of rust that will be used, and available targets - # is controlled by a `rust-toolchain.toml` file when the RUST_SETUP UDC is run. + # is controlled by a `rust-toolchain.toml` file when the `SETUP` UDC is run. # HOWEVER, It is enforced that the rust version in `rust-toolchain.toml` MUST match this version. FROM rust:1.73-alpine3.18 diff --git a/examples/postgresql/Earthfile b/examples/postgresql/Earthfile index dbc23b018..da879fd55 100644 --- a/examples/postgresql/Earthfile +++ b/examples/postgresql/Earthfile @@ -8,7 +8,7 @@ builder: WORKDIR /build COPY --dir ./migrations ./data ./refinery.toml . - DO ./../../earthly/postgresql+SETUP + DO ./../../earthly/postgresql+BUILDER check: FROM +builder diff --git a/examples/python/Earthfile b/examples/python/Earthfile index fb28ae355..d4745ccb7 100644 --- a/examples/python/Earthfile +++ b/examples/python/Earthfile @@ -4,7 +4,7 @@ builder: FROM ./../../earthly/python+python-base COPY --dir ./src . - DO ./../../earthly/python+SETUP + DO ./../../earthly/python+BUILDER test: FROM +builder