From 852efa9cd30ad6ec21da97c4d146727d16d78429 Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Thu, 6 Mar 2025 14:46:47 +0530 Subject: [PATCH 01/15] Added config for nats-box (dummy package) Signed-off-by: Anmol Virdi --- nats-box.yaml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 nats-box.yaml diff --git a/nats-box.yaml b/nats-box.yaml new file mode 100644 index 00000000000..1c0f9ccd136 --- /dev/null +++ b/nats-box.yaml @@ -0,0 +1,57 @@ +package: + name: nats-box + version: 0.16.0 + epoch: 4 + description: A lightweight container with NATS utilities. + dependencies: + runtime: + - bash + - nats + - nats-top + - nsc + - ca-certificates + - curl + - jq + # - figlet + copyright: + - license: Apache-2.0 + +environment: + contents: + packages: + - busybox + +pipeline: + - uses: git-checkout + with: + repository: https://github.com/nats-io/nats-box + tag: v${{package.version}} + expected-commit: b73821692fc596b210816de93c5011047298646b + + - runs: | + mkdir -p ${{targets.destdir}}/etc + mv profile.sh ${{targets.destdir}}/etc/profile.sh + mv entrypoint.sh ${{targets.destdir}}/entrypoint.sh + +update: + enabled: true + github: + identifier: nats-io/nats-box + strip-prefix: v + +test: + environment: + contents: + packages: + - bash + pipeline: + - name: "Verify basic components" + runs: | + nats --version + nats-top --version + nsc --version + update-ca-certificates --version + curl --version + jq --version + # figlet -v + From f49ad763f3d00724961784f745dbece14e625bf4 Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Thu, 6 Mar 2025 14:58:22 +0530 Subject: [PATCH 02/15] Fixed description Signed-off-by: Anmol Virdi --- nats-box.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nats-box.yaml b/nats-box.yaml index 1c0f9ccd136..c325fd97d2c 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -2,7 +2,7 @@ package: name: nats-box version: 0.16.0 epoch: 4 - description: A lightweight container with NATS utilities. + description: NATS utilities toolbox. dependencies: runtime: - bash From 195c1050dc362ec212abed1bf76678f22b00eda9 Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Fri, 7 Mar 2025 16:25:15 +0530 Subject: [PATCH 03/15] Fixed profile.sh issue Signed-off-by: Anmol Virdi --- nats-box.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nats-box.yaml b/nats-box.yaml index c325fd97d2c..9fed73ca9b4 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -1,7 +1,7 @@ package: name: nats-box version: 0.16.0 - epoch: 4 + epoch: 5 description: NATS utilities toolbox. dependencies: runtime: @@ -29,8 +29,8 @@ pipeline: expected-commit: b73821692fc596b210816de93c5011047298646b - runs: | - mkdir -p ${{targets.destdir}}/etc - mv profile.sh ${{targets.destdir}}/etc/profile.sh + mkdir -p ${{targets.destdir}}/etc/profile.d + mv profile.sh ${{targets.destdir}}/etc/profile.d mv entrypoint.sh ${{targets.destdir}}/entrypoint.sh update: From f704d2688249be6bf5365331193ce18d1f7d2918 Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Mon, 10 Mar 2025 17:08:23 +0530 Subject: [PATCH 04/15] Added figlet to Nats-box utilities list Signed-off-by: Anmol Virdi --- nats-box.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nats-box.yaml b/nats-box.yaml index 9fed73ca9b4..90572a09d99 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -1,7 +1,7 @@ package: name: nats-box version: 0.16.0 - epoch: 5 + epoch: 0 description: NATS utilities toolbox. dependencies: runtime: @@ -12,7 +12,7 @@ package: - ca-certificates - curl - jq - # - figlet + - figlet copyright: - license: Apache-2.0 @@ -53,5 +53,5 @@ test: update-ca-certificates --version curl --version jq --version - # figlet -v + figlet -v From d48233e4da87259a2322fd2ee29b87d54bb282a4 Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Mon, 10 Mar 2025 17:42:52 +0530 Subject: [PATCH 05/15] Fixed linting issues Signed-off-by: Anmol Virdi --- nats-box.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nats-box.yaml b/nats-box.yaml index 90572a09d99..64634ca772c 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -6,13 +6,13 @@ package: dependencies: runtime: - bash - - nats - - nats-top - - nsc - ca-certificates - curl - - jq - figlet + - jq + - nats + - nats-top + - nsc copyright: - license: Apache-2.0 @@ -54,4 +54,3 @@ test: curl --version jq --version figlet -v - From 497a677514e598652df47de94bcc96c69b1a9b05 Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Mon, 10 Mar 2025 17:53:27 +0530 Subject: [PATCH 06/15] Removed bash from test environment since it's not needed Signed-off-by: Anmol Virdi --- nats-box.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nats-box.yaml b/nats-box.yaml index 64634ca772c..f814d51ddb0 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -40,10 +40,6 @@ update: strip-prefix: v test: - environment: - contents: - packages: - - bash pipeline: - name: "Verify basic components" runs: | From 38ae98555d4b23f5a234d6638394c9ec436c098f Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Mon, 10 Mar 2025 18:37:28 +0530 Subject: [PATCH 07/15] Updated nats-box tests Signed-off-by: Anmol Virdi --- nats-box.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/nats-box.yaml b/nats-box.yaml index f814d51ddb0..4f9bdb8f16a 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -41,12 +41,7 @@ update: test: pipeline: - - name: "Verify basic components" + - name: "Verify entrypoint.sh and profile.sh files" runs: | - nats --version - nats-top --version - nsc --version - update-ca-certificates --version - curl --version - jq --version - figlet -v + test -s "../../etc/profile.d/profile.sh" + test -s "../../entrypoint.sh" From aac68105b8d18e0ee1af47f7ce96bcabf171630b Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Wed, 12 Mar 2025 17:30:26 +0530 Subject: [PATCH 08/15] Fixed exec permissions for entrypoint Signed-off-by: Anmol Virdi --- nats-box.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/nats-box.yaml b/nats-box.yaml index 4f9bdb8f16a..38be4da5994 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -32,6 +32,7 @@ pipeline: mkdir -p ${{targets.destdir}}/etc/profile.d mv profile.sh ${{targets.destdir}}/etc/profile.d mv entrypoint.sh ${{targets.destdir}}/entrypoint.sh + chmod +x ${{targets.destdir}}/entrypoint.sh update: enabled: true From 5744bec5b582b31b99456a1cb0e24912c9709afc Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Wed, 12 Mar 2025 17:42:33 +0530 Subject: [PATCH 09/15] Fixed read access for entrypoint Signed-off-by: Anmol Virdi --- nats-box.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nats-box.yaml b/nats-box.yaml index 38be4da5994..4f5464b083f 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -32,7 +32,7 @@ pipeline: mkdir -p ${{targets.destdir}}/etc/profile.d mv profile.sh ${{targets.destdir}}/etc/profile.d mv entrypoint.sh ${{targets.destdir}}/entrypoint.sh - chmod +x ${{targets.destdir}}/entrypoint.sh + chmod 777 ${{targets.destdir}}/entrypoint.sh update: enabled: true From d14f521337943ba289a4e8c8a00f203d4ed025af Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Tue, 18 Mar 2025 07:39:09 +0530 Subject: [PATCH 10/15] Added version update instructions for nats-box Signed-off-by: Anmol Virdi --- nats-box.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nats-box.yaml b/nats-box.yaml index 4f5464b083f..05f7a937683 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -1,7 +1,7 @@ package: name: nats-box version: 0.16.0 - epoch: 0 + epoch: 30 description: NATS utilities toolbox. dependencies: runtime: @@ -30,6 +30,7 @@ pipeline: - runs: | mkdir -p ${{targets.destdir}}/etc/profile.d + sed -i 's/^.*MARKER-REPLACE-LINE-IN-CI.*/echo "nats-box v${{package.version}}" >\&2/' profile.sh mv profile.sh ${{targets.destdir}}/etc/profile.d mv entrypoint.sh ${{targets.destdir}}/entrypoint.sh chmod 777 ${{targets.destdir}}/entrypoint.sh From 806c4a96272adcc1547e450f9f2f2fab3ad43fbb Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Tue, 18 Mar 2025 07:40:50 +0530 Subject: [PATCH 11/15] Fixed epoch number Signed-off-by: Anmol Virdi --- nats-box.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nats-box.yaml b/nats-box.yaml index 05f7a937683..9e915d335b6 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -1,7 +1,7 @@ package: name: nats-box version: 0.16.0 - epoch: 30 + epoch: 0 description: NATS utilities toolbox. dependencies: runtime: From a27405aa6a7b5282daedda08f1cc080c212b21d2 Mon Sep 17 00:00:00 2001 From: Anmol Virdi <67299745+AnmolVirdi@users.noreply.github.com> Date: Fri, 21 Mar 2025 16:06:41 +0530 Subject: [PATCH 12/15] Update nats-box.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Furkan Türkal Signed-off-by: Anmol Virdi <67299745+AnmolVirdi@users.noreply.github.com> --- nats-box.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nats-box.yaml b/nats-box.yaml index 9e915d335b6..25890c4df7d 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -31,9 +31,8 @@ pipeline: - runs: | mkdir -p ${{targets.destdir}}/etc/profile.d sed -i 's/^.*MARKER-REPLACE-LINE-IN-CI.*/echo "nats-box v${{package.version}}" >\&2/' profile.sh - mv profile.sh ${{targets.destdir}}/etc/profile.d - mv entrypoint.sh ${{targets.destdir}}/entrypoint.sh - chmod 777 ${{targets.destdir}}/entrypoint.sh + install -Dm755 profile.sh ${{targets.destdir}}/etc/profile.d + install -Dm755 entrypoint.sh ${{targets.destdir}}/entrypoint.sh update: enabled: true From c25e984f2502fac848b8107a2735ed856ecaf709 Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Mon, 24 Mar 2025 17:46:13 +0530 Subject: [PATCH 13/15] Remove nats util packages from package layer Signed-off-by: Anmol Virdi --- nats-box.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/nats-box.yaml b/nats-box.yaml index 25890c4df7d..67c2411692c 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -10,9 +10,6 @@ package: - curl - figlet - jq - - nats - - nats-top - - nsc copyright: - license: Apache-2.0 From 6f240053ba1ea30ff6503de948aaa67654516911 Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Wed, 2 Apr 2025 16:39:32 +0530 Subject: [PATCH 14/15] Updated version Signed-off-by: Anmol Virdi --- nats-box.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nats-box.yaml b/nats-box.yaml index 67c2411692c..51bd9682d0a 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -1,6 +1,6 @@ package: name: nats-box - version: 0.16.0 + version: 0.17.0 epoch: 0 description: NATS utilities toolbox. dependencies: From 01c1aa435f9c744afce64e6562c7a45291fc916f Mon Sep 17 00:00:00 2001 From: Anmol Virdi Date: Wed, 2 Apr 2025 16:52:22 +0530 Subject: [PATCH 15/15] Updated commit hash Signed-off-by: Anmol Virdi --- nats-box.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nats-box.yaml b/nats-box.yaml index 51bd9682d0a..d0d54a571e4 100644 --- a/nats-box.yaml +++ b/nats-box.yaml @@ -23,7 +23,7 @@ pipeline: with: repository: https://github.com/nats-io/nats-box tag: v${{package.version}} - expected-commit: b73821692fc596b210816de93c5011047298646b + expected-commit: dd2fba50b95c5a8b708bc23bd3ed7ee068cef2cc - runs: | mkdir -p ${{targets.destdir}}/etc/profile.d