Skip to content

Commit 2ca8cac

Browse files
fix: added new tools, such as Palette CLI and CanvOS (#17)
* fix: added new tools, such as Palette CLI and CanvOS * ci: added missing env variable * ci: added missing env variable
1 parent 715664a commit 2ca8cac

File tree

6 files changed

+29
-16
lines changed

6 files changed

+29
-16
lines changed

.github/workflows/release.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ on:
66

77
env:
88
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9-
PALETTE_VERSION: 3.3.0
10-
PALETTE_CLI_VERSION: 3.3.0
9+
PALETTE_VERSION: 3.4.0
10+
PALETTE_CLI_VERSION: 3.4.0
11+
PALETTE_EDGE_VERSION: 3.4.3
12+
1113

1214

1315
jobs:
@@ -22,7 +24,7 @@ jobs:
2224
- name: Setup nodeJs
2325
uses: actions/[email protected]
2426
with:
25-
node-version: '14'
27+
node-version: '18'
2628

2729
- name: Check out code into the Go module directory
2830
uses: actions/checkout@v3
@@ -63,6 +65,7 @@ jobs:
6365
build-args: |
6466
PALETTE_VERSION=${{env.PALETTE_VERSION}}
6567
PALETTE_CLI_VERSION=${{env.PALETTE_CLI_VERSION}}
68+
PALETTE_EDGE_VERSION=${{env.PALETTE_EDGE_VERSION}}
6669
platforms: linux/amd64,linux/arm64
6770
push: true
6871
tags: ghcr.io/${{ github.repository }}:${{steps.dependencies.outputs.VERSION}}

.github/workflows/test.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ on:
66

77
env:
88
GITHUB_TOKEN: ${{ github.token }}
9-
PALETTE_VERSION: 3.3.0
10-
PALETTE_CLI_VERSION: 3.3.0
9+
PALETTE_VERSION: 3.4.0
10+
PALETTE_CLI_VERSION: 3.4.0
11+
PALETTE_EDGE_VERSION: 3.4.3
1112

1213
concurrency:
1314
group: docker-${{ github.ref }}
@@ -71,5 +72,6 @@ jobs:
7172
build-args: |
7273
PALETTE_VERSION=${{env.PALETTE_VERSION}}
7374
PALETTE_CLI_VERSION=${{env.PALETTE_CLI_VERSION}}
75+
PALETTE_EDGE_VERSION=${{env.PALETTE_EDGE_VERSION}}
7476
7577

.releaserc.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ repositoryUrl: https://github.com/spectrocloud/tutorials
33
plugins:
44
- "@semantic-release/commit-analyzer"
55
- "@semantic-release/release-notes-generator"
6-
- "@semantic-release/changelog"
76
- - "@semantic-release/exec"
87
- analyzeCommitsCmd: echo 'NEW_VERSION=false' > VERSION.env
98
verifyReleaseCmd: |-
@@ -12,8 +11,4 @@ plugins:
1211
- - "@semantic-release/github"
1312
- assets:
1413
- "*.zip"
15-
- - "@semantic-release/git"
16-
- assets:
17-
- CHANGELOG.md
18-
- - "@semantic-release/npm"
19-
- npmPublish: false
14+
- - "@semantic-release/git"

Dockerfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ADD static/defaults/htpasswd-basic /auth/htpasswd-basic
1313
ADD static/defaults/ngrok.yml /auth/ngrok.yml
1414

1515
ARG PALETTE_CLI_VERSION
16+
ARG PALETTE_EDGE_VERSION
1617

1718
ENV REGISTRY_LOG_LEVEL=info
1819
ENV REGISTRY_AUTH=htpasswd
@@ -36,7 +37,15 @@ RUN wget https://software.spectrocloud.com/spectro-registry/v$PALETTE_CLI_VERSI
3637
chmod +x ./kubectl && \
3738
mv ./kubectl /usr/local/bin/kubectl && \
3839
mkdir -p ~/.config/ngrok && \
39-
cp /auth/ngrok.yml ~/.config/ngrok/ngrok.yml
40+
cp /auth/ngrok.yml ~/.config/ngrok/ngrok.yml && \
41+
wget https://software.spectrocloud.com/palette-cli/v$PALETTE_CLI_VERSION/linux/cli/palette && \
42+
mv palette /usr/local/bin/palette && \
43+
chmod +x /usr/local/bin/palette && \
44+
wget https://software.spectrocloud.com/stylus/v$PALETTE_EDGE_VERSION/cli/linux/palette-edge && \
45+
mv palette-edge /usr/local/bin/palette-edge && \
46+
chmod +x /usr/local/bin/palette-edge && \
47+
git clone https://github.com/spectrocloud/CanvOS.git && \
48+
rm -rf /var/cache/apk/*
4049

4150

4251
EXPOSE 5000

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ init:
22
npm ci
33

44
build-docker:
5-
docker build --build-arg PALETTE_VERSION=$(VERSION) --build-arg PALETTE_CLI_VERSION=$(VERSION) -t tutorials .
5+
@echo "Building docker image"
6+
docker build --build-arg PALETTE_VERSION=$(VERSION) --build-arg PALETTE_CLI_VERSION=$(VERSION) --build-arg PALETTE_EDGE_VERSION=$(EDGE) -t tutorials .

docs/docker.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ The Docker image includes the following tools.
2121
| Tool | Description |
2222
|---------------|----------------------------------------------------------------|
2323
| `terraform` | Infrastructure as code tool |
24+
| `palette cli` | The offical Palette CLI |
2425
| `spectro cli` | Spectro Cloud command-line interface |
26+
| `palette edge cli`| The Edge Installer CLU |
2527
| `spectro registry server` | Spectro Cloud Registry Server |
2628
| `ngrok` | Secure tunnels to localhost |
2729
| `kubectl` | Kubernetes command-line tool |
@@ -34,6 +36,7 @@ The Docker image includes the following tools.
3436
| `wget` | Free utility for non-interactive download of files from the Web|
3537
| `nano` | A text editior alternative to Vi. |
3638
| `ca-certificates` | Common set of CA certificates |
39+
| `canvos` | A utility for creating Edge artifacts |
3740
| `nano` | A text editior for Unix-like computing systems or operating environments using a command line interface|
3841

3942
### Spectro Cloud Pack Registry Server
@@ -54,16 +57,16 @@ registry serve /etc/spectro/config.yml > /var/log/registry.log 2>&1 &
5457

5558
# Local Builds
5659

57-
If you are wanting to build the docker image locally you must provide the the build arguments for `PALETTE_VERSION` and `PALETTE_CLI_VERSION`. Use the following command to build a local image. Replace the versions as needed.
60+
If you are wanting to build the docker image locally you must provide the the build arguments for `PALETTE_VERSION` and `PALETTE_CLI_VERSION`, `PALETTE_EDGE_VERSION`. Use the following command to build a local image. Replace the versions as needed.
5861

5962

6063
```shell
61-
make build-docker VERSION=3.3.0
64+
make build-docker VERSION=3.3.0 EDGE=3.4.3
6265
```
6366

6467
OR
6568

6669
```shell
67-
docker build --build-arg PALETTE_VERSION=3.3.0 --build-arg PALETTE_CLI_VERSION=3.3.0 -t tutorials .
70+
docker build --build-arg PALETTE_VERSION=3.3.0 --build-arg PALETTE_CLI_VERSION=3.3.0 --build-arg= PALETTE_EDGE_VERSION=3.4.3 -t tutorials .
6871
```
6972

0 commit comments

Comments
 (0)