Site: new placeholders for nightly version, tag and unstable suffix #8939

adutra · 2024-06-26T09:09:13Z

No description provided.

adutra · 2024-06-26T09:09:47Z

site/in-dev/gc.md

@@ -33,7 +33,7 @@ The Nessie GC tool can be downloaded from the [GitHub
 Releases](https://github.com/projectnessie/nessie/releases) page, for example:

 ```shell
-curl -L -o nessie-gc.jar https://github.com/projectnessie/nessie/releases/download/nessie-::NESSIE_VERSION::/nessie-gc-::NESSIE_VERSION::.jar
+curl -L -o nessie-gc.jar https://github.com/projectnessie/nessie/releases/download/nessie-::NESSIE_VERSION_BASE::/nessie-gc-::NESSIE_VERSION_BASE::.jar


Obviously, this link will give 404. I don't think there is much we can do about it.

I think it's better to just link the GC options on the downloads page and remove the curl example

adutra · 2024-06-26T10:26:54Z

site/bin/_lib.sh

-  echo "     ... replace version placeholder in versioned docs"
-  find "${target}" -name "*.md" -exec sed -i "s/::NESSIE_VERSION::/${RELEASE_VERSION}/g" {} \;
+  echo "     ... replace version placeholders in versioned docs"
+  find "${target}" -name "*.md" -exec sed -i='' "s/::NESSIE_VERSION::/${RELEASE_VERSION}/g" {} \;


According to this SO question, the syntax -i='' should be portable across different OSes (just -i gives an error on macOS).

Seems to work, yes

snazy · 2024-06-26T10:36:10Z

site/in-dev/gc.md

-curl -L -o nessie-gc.jar https://github.com/projectnessie/nessie/releases/download/nessie-::NESSIE_VERSION::/nessie-gc-::NESSIE_VERSION::.jar
-```
-
-To see the available commands and options, run:


Let's keep this line separate.

snazy · 2024-06-26T10:40:29Z

site/bin/_lib.sh

@@ -108,6 +112,12 @@ create_nightly () {
  mv build/versions/nightly/docs/mkdocs.yml build/versions/nightly
  rm build/versions/nightly/docs/index-release.md

+  echo "     ... replace version placeholders in versioned docs"
+  find build/versions/nightly/docs -name "*.md" -exec sed -i='' "s/::NESSIE_VERSION::/${version}/g" {} \;
+  find build/versions/nightly/docs -name "*.md" -exec sed -i='' "s/::NESSIE_VERSION_BASE::/${version_base}/g" {} \;


Hm - I don't see NESSIE_VERSION_BASE being used.

Yeah it's "just in case"

snazy · 2024-06-26T10:41:07Z

site/bin/_lib.sh

+  find build/versions/nightly/docs -name "*.md" -exec sed -i='' "s/::NESSIE_TAG::/latest/g" {} \;
+  find build/versions/nightly/docs -name "*.md" -exec sed -i='' "s/::NESSIE_UNSTABLE::/-unstable/g" {} \;


Suggested change

find build/versions/nightly/docs -name "*.md" -exec sed -i='' "s/::NESSIE_TAG::/latest/g" {} \;

find build/versions/nightly/docs -name "*.md" -exec sed -i='' "s/::NESSIE_UNSTABLE::/-unstable/g" {} \;

find build/versions/nightly/docs -name "*.md" -exec sed -i='' "s/::NESSIE_DOCKER_SUFFIX::/-unstable:latest/g" {} \;

(Similar below for releases)

snazy · 2024-06-26T10:41:43Z

site/bin/_lib.sh

+  find "${target}" -name "*.md" -exec sed -i='' "s/::NESSIE_TAG::/${RELEASE_VERSION}/g" {} \;
+  find "${target}" -name "*.md" -exec sed -i='' "s/::NESSIE_UNSTABLE:://g" {} \;


Suggested change

find "${target}" -name "*.md" -exec sed -i='' "s/::NESSIE_TAG::/${RELEASE_VERSION}/g" {} \;

find "${target}" -name "*.md" -exec sed -i='' "s/::NESSIE_UNSTABLE:://g" {} \;

find "${target}" -name "*.md" -exec sed -i='' "s/::NESSIE_DOCKER_SUFFIX::/:${RELEASE_VERSION}/g" {} \;

snazy · 2024-06-26T10:42:00Z

site/in-dev/gc.md

@@ -92,7 +86,7 @@ docker run --rm -e POSTGRES_USER=pguser -e POSTGRES_PASSWORD=mysecretpassword -e
 Create the database schema if required:

 ```shell
-docker run --rm ghcr.io/projectnessie/nessie-gc:::NESSIE_VERSION:: create-sql-schema \
+docker run --rm ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG:: create-sql-schema \


Suggested change

docker run --rm ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG:: create-sql-schema \

docker run --rm ghcr.io/projectnessie/nessie-gc::NESSIE_DOCKER_SUFFIX:: create-sql-schema \

snazy · 2024-06-26T10:42:12Z

site/in-dev/gc.md

@@ -101,16 +95,16 @@ docker run --rm ghcr.io/projectnessie/nessie-gc:::NESSIE_VERSION:: create-sql-sc
 Now we can run the Nessie GC tool:

 ```shell
-docker run --rm ghcr.io/projectnessie/nessie-gc:::NESSIE_VERSION:: gc \
+docker run --rm ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG:: gc \


Suggested change

docker run --rm ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG:: gc \

docker run --rm ghcr.io/projectnessie/nessie-gc::NESSIE_DOCKER_SUFFIX:: gc \

snazy · 2024-06-26T10:42:25Z

site/in-dev/gc.md

-ghcr.io/projectnessie/nessie-gc:::NESSIE_VERSION:: --help`. The main command is `gc`, which is followed by
-subcommands and options. Check the available subcommands and options by running `docker run --rm
-ghcr.io/projectnessie/nessie-gc:::NESSIE_VERSION:: gc --help`.
+ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG:: --help`. The main command is `gc`,


Suggested change

ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG:: --help`. The main command is `gc`,

ghcr.io/projectnessie/nessie-gc::NESSIE_DOCKER_SUFFIX:: --help`. The main command is `gc`,

snazy · 2024-06-26T10:42:32Z

site/in-dev/gc.md

-ghcr.io/projectnessie/nessie-gc:::NESSIE_VERSION:: gc --help`.
+ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG:: --help`. The main command is `gc`,
+which is followed by subcommands and options. Check the available subcommands and options by running
+`docker run --rm ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG:: gc --help`.


Suggested change

`docker run --rm ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG:: gc --help`.

`docker run --rm ghcr.io/projectnessie/nessie-gc::NESSIE_DOCKER_SUFFIX:: gc --help`.

snazy · 2024-06-26T10:42:41Z

site/in-dev/gc.md

@@ -142,7 +136,7 @@ spec:
    spec:
      containers:
      - name: nessie-gc
-        image: ghcr.io/projectnessie/nessie-gc:::NESSIE_VERSION::
+        image: ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG::


Suggested change

image: ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG::

image: ghcr.io/projectnessie/nessie-gc::NESSIE_DOCKER_SUFFIX::

Site: new placeholders for nightly version, tag and unstable suffix

8c4b5f5

adutra commented Jun 26, 2024

View reviewed changes

adutra mentioned this pull request Jun 26, 2024

Nessie CLI: publish Docker images #8935

Merged

remove curl

db246fb

adutra commented Jun 26, 2024

View reviewed changes

snazy reviewed Jun 26, 2024

View reviewed changes

NESSIE_DOCKER_SUFFIX

13b23d1

snazy approved these changes Jun 26, 2024

View reviewed changes

adutra merged commit 1e4030c into projectnessie:main Jun 26, 2024
18 checks passed

adutra deleted the nightly-latest branch June 26, 2024 11:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Site: new placeholders for nightly version, tag and unstable suffix #8939

Site: new placeholders for nightly version, tag and unstable suffix #8939

adutra commented Jun 26, 2024

adutra Jun 26, 2024

snazy Jun 26, 2024

adutra Jun 26, 2024

snazy Jun 26, 2024

snazy Jun 26, 2024

snazy Jun 26, 2024

adutra Jun 26, 2024

adutra Jun 26, 2024

snazy Jun 26, 2024

snazy Jun 26, 2024

snazy Jun 26, 2024

snazy Jun 26, 2024

snazy Jun 26, 2024

snazy Jun 26, 2024

snazy Jun 26, 2024

		find build/versions/nightly/docs -name "*.md" -exec sed -i='' "s/::NESSIE_TAG::/latest/g" {} \;
		find build/versions/nightly/docs -name "*.md" -exec sed -i='' "s/::NESSIE_UNSTABLE::/-unstable/g" {} \;

		find "${target}" -name "*.md" -exec sed -i='' "s/::NESSIE_TAG::/${RELEASE_VERSION}/g" {} \;
		find "${target}" -name "*.md" -exec sed -i='' "s/::NESSIE_UNSTABLE:://g" {} \;

	docker run --rm ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG:: create-sql-schema \
	docker run --rm ghcr.io/projectnessie/nessie-gc::NESSIE_DOCKER_SUFFIX:: create-sql-schema \

	ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG:: --help`. The main command is `gc`,
	ghcr.io/projectnessie/nessie-gc::NESSIE_DOCKER_SUFFIX:: --help`. The main command is `gc`,

	`docker run --rm ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG:: gc --help`.
	`docker run --rm ghcr.io/projectnessie/nessie-gc::NESSIE_DOCKER_SUFFIX:: gc --help`.

	image: ghcr.io/projectnessie/nessie-gc::NESSIE_UNSTABLE:::::NESSIE_TAG::
	image: ghcr.io/projectnessie/nessie-gc::NESSIE_DOCKER_SUFFIX::

Site: new placeholders for nightly version, tag and unstable suffix #8939

Site: new placeholders for nightly version, tag and unstable suffix #8939

Conversation

adutra commented Jun 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment