Skip to content

Commit

Permalink
Use the projectsyn fork of jsonnet-bundler
Browse files Browse the repository at this point in the history
  • Loading branch information
bastjan committed Sep 22, 2023
1 parent 9021d13 commit 16244eb
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install jsonnet-bundler
run: |
mkdir -p /opt/bin && curl -sLo /opt/bin/jb \
https://github.com/jsonnet-bundler/jsonnet-bundler/releases/download/v0.4.0/jb-linux-amd64 \
https://github.com/projectsyn/jsonnet-bundler/releases/download/v0.6.1/jb_linux_amd64 \
&& chmod +x /opt/bin/jb
- name: Update PATH
run: echo "/opt/bin" >> $GITHUB_PATH
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Install jsonnet-bundler
run: |
mkdir -p /opt/bin && curl -sLo /opt/bin/jb \
https://github.com/jsonnet-bundler/jsonnet-bundler/releases/download/v0.4.0/jb-linux-amd64 \
https://github.com/projectsyn/jsonnet-bundler/releases/download/v0.6.1/jb_linux_amd64 \
&& chmod +x /opt/bin/jb
- name: Update PATH
run: echo "/opt/bin" >> $GITHUB_PATH
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
- name: Install jsonnet-bundler
run: |
mkdir -p /opt/bin && curl -sLo /opt/bin/jb \
https://github.com/jsonnet-bundler/jsonnet-bundler/releases/download/v0.4.0/jb-linux-amd64 \
https://github.com/projectsyn/jsonnet-bundler/releases/download/v0.6.1/jb_linux_amd64 \
&& chmod +x /opt/bin/jb
- name: Update PATH
run: echo "/opt/bin" >> $GITHUB_PATH
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
- name: Install jsonnet-bundler
run: |
mkdir -p /opt/bin && curl -sLo /opt/bin/jb \
https://github.com/jsonnet-bundler/jsonnet-bundler/releases/download/v0.4.0/jb-linux-amd64 \
https://github.com/projectsyn/jsonnet-bundler/releases/download/v0.6.1/jb_linux_amd64 \
&& chmod +x /opt/bin/jb
- name: Update PATH
run: echo "/opt/bin" >> $GITHUB_PATH
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
- name: Install jsonnet-bundler
run: |
mkdir -p /opt/bin && curl -sLo /opt/bin/jb \
https://github.com/jsonnet-bundler/jsonnet-bundler/releases/download/v0.4.0/jb-linux-amd64 \
https://github.com/projectsyn/jsonnet-bundler/releases/download/v0.6.1/jb_linux_amd64 \
&& chmod +x /opt/bin/jb
- name: Update PATH
run: echo "/opt/bin" >> $GITHUB_PATH
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master

ARG KUSTOMIZE_VERSION=5.0.0

RUN ./tools/install-jb.sh v0.4.0 \
RUN ./tools/install-jb.sh v0.6.1 \
&& curl -fsSLO "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" \
&& chmod +x install_kustomize.sh \
&& ./install_kustomize.sh ${KUSTOMIZE_VERSION} /usr/local/bin
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ Commodore also supports additional processing on the output of Kapitan, such as

* Python 3.8 - 3.11 with `python3-dev` and `python3-venv` updated
* [jsonnet-bundler](https://github.com/jsonnet-bundler/jsonnet-bundler)
* Our fork [projectsyn/jsonnet-bundler](https://github.com/projectsyn/jsonnet-bundler) is currently recommended.
It parallelizes fetching of dependencies, which speeds up Commodore significantly, and has fixes to make the dependency fetching more deterministic.
* `libmagic` (install with `brew install libmagic` on macOS)

## Getting started
Expand All @@ -44,7 +46,7 @@ Commodore also supports additional processing on the output of Kapitan, such as
```console
pip install syn-commodore
```
1. <a name="getting_started_jsonnet"></a>Install jsonnet-bundler according to upstream [documentation](https://github.com/jsonnet-bundler/jsonnet-bundler#install).
1. <a name="getting_started_jsonnet"></a>Download jsonnet-bundler from [projectsyn/jsonnet-bundler/releases](https://github.com/projectsyn/jsonnet-bundler/releases) and put the binary in your `$PATH` as `jb`.

1. For Commodore to work, you need to run an instance of [Lieutenant](https://syn.tools/syn/tutorials/getting-started.html#_kickstart_lieutenant) somewhere
(locally is fine too).
Expand Down Expand Up @@ -88,7 +90,7 @@ Commodore also supports additional processing on the output of Kapitan, such as
poetry install
```

Install jsonnet-bundler according to upstream [documentation](https://github.com/jsonnet-bundler/jsonnet-bundler#install).
Download jsonnet-bundler from [projectsyn/jsonnet-bundler/releases](https://github.com/projectsyn/jsonnet-bundler/releases) and put the binary in your `$PATH` as `jb`.


1. Finish setup as described [above](#getting_started_jsonnet)
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/explanation/running-commodore.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ We recommend that you install Python and the `venv` module with your preferred p
On Linux distributions you'll want packages `python3-dev` or `python3-devel` and `libffi-dev` or `libffi-devel` respectively.
Please refer to your operating system's documentation for instructions to setup a working C compiler.
* On some Linux distributions, you may need to install the Python `wheel` package manually.
* `jsonnet-bundler`, https://github.com/jsonnet-bundler/jsonnet-bundler#install[installation instructions]
* jsonnet-bundler from https://github.com/projectsyn/jsonnet-bundler/releases[projectsyn/jsonnet-bundler/releases] in your `$PATH` as `jb`.
* Helm 3, https://helm.sh/docs/intro/install/[installation instructions]
* `kustomize`, some components might require Kustomize.
Versions >= 4 are recommended.
Expand Down
2 changes: 1 addition & 1 deletion tools/install-jb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ case $ARCH in
esac

curl -fsSLo /usr/local/bin/jb \
"https://github.com/jsonnet-bundler/jsonnet-bundler/releases/download/$VERSION/jb-linux-$ARCH"
"https://github.com/projectsyn/jsonnet-bundler/releases/download/$VERSION/jb_linux_$ARCH"

chmod +x /usr/local/bin/jb

0 comments on commit 16244eb

Please sign in to comment.