Skip to content

Commit 606c9d6

Browse files
karl-cardenas-codingkarl-cardenas-coding
authored
fix: updated dependencies (#35)
1 parent 0557096 commit 606c9d6

File tree

4 files changed

+103
-114
lines changed

4 files changed

+103
-114
lines changed

‎.github/workflows/release.yaml‎

Lines changed: 64 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -2,96 +2,92 @@ name: Release to Production
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [main]
66

77
env:
88
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
99
PALETTE_VERSION: 4.0.2
10-
PALETTE_CLI_VERSION: 4.0.1
11-
PALETTE_EDGE_VERSION: 3.4.3
10+
PALETTE_CLI_VERSION: 4.2.2
11+
PALETTE_EDGE_VERSION: 4.2.3
1212
PACKER_VERSION: 1.9.4
1313
ORAS_VERSION: 1.0.0
14-
TERRAFORM_VERSION: 1.6.5
14+
TERRAFORM_VERSION: 1.7.0
15+
PALETTE_REGISTRY_CLI_VERSION: 4.2.0
1516

16-
17-
jobs:
17+
jobs:
1818
docker:
1919
name: "Release Docker image"
2020
runs-on: ubuntu-latest
2121
outputs:
2222
VERSION: ${{ steps.get-version.outputs.version }}
2323
steps:
24+
- name: Setup nodeJs
25+
uses: actions/[email protected]
26+
with:
27+
node-version: "18"
2428

29+
- name: Check out code into the Go module directory
30+
uses: actions/checkout@v4
2531

26-
- name: Setup nodeJs
27-
uses: actions/[email protected]
28-
with:
29-
node-version: '18'
30-
31-
- name: Check out code into the Go module directory
32-
uses: actions/checkout@v4
33-
34-
-
35-
name: "Get dependencies"
36-
id: dependencies
37-
run: |
32+
- name: "Get dependencies"
33+
id: dependencies
34+
run: |
3835
npm ci
3936
npx semantic-release --dry-run
4037
cat VERSION.env
4138
source VERSION.env
4239
echo "version=$VERSION" >> $GITHUB_OUTPUT
4340
44-
- name: Set up QEMU
45-
if: ${{ steps.dependencies.outputs.VERSION != ''}}
46-
uses: docker/setup-qemu-action@v2
47-
48-
- name: "Set up Docker Buildx"
49-
if: ${{ steps.dependencies.outputs.VERSION != ''}}
50-
uses: docker/setup-buildx-action@v2
51-
41+
- name: Set up QEMU
42+
if: ${{ steps.dependencies.outputs.VERSION != ''}}
43+
uses: docker/setup-qemu-action@v2
5244

53-
- name: Login to GHCR
54-
if: ${{ steps.dependencies.outputs.VERSION != ''}}
55-
uses: docker/login-action@v1
56-
with:
57-
registry: ghcr.io
58-
username: ${{ github.repository_owner }}
59-
password: ${{ secrets.GITHUB_TOKEN }}
60-
61-
62-
- name: Build and push
63-
if: ${{ steps.dependencies.outputs.VERSION != ''}}
64-
uses: docker/build-push-action@v2
65-
id: build-and-push
66-
with:
67-
context: .
68-
build-args: |
69-
PALETTE_VERSION=${{env.PALETTE_VERSION}}
70-
PALETTE_CLI_VERSION=${{env.PALETTE_CLI_VERSION}}
71-
PALETTE_EDGE_VERSION=${{env.PALETTE_EDGE_VERSION}}
72-
PACKER_VERSION=${{env.PACKER_VERSION}}
73-
ORAS_VERSION=${{env.ORAS_VERSION}}
74-
TERRAFORM_VERSION=${{env.TERRAFORM_VERSION}}
75-
platforms: linux/amd64,linux/arm64
76-
push: true
77-
tags: ghcr.io/${{ github.repository }}:${{steps.dependencies.outputs.VERSION}}
78-
79-
- uses: sigstore/[email protected]
80-
81-
- name: Image Signing
82-
run: |
83-
cosign sign --yes \
84-
-a "repo=${{ github.repository }}" \
85-
-a "workflow=${{ github.workflow }}" \
86-
-a "ref=${{ github.sha }}" \
87-
-a "owner=Spectro Cloud" \
88-
--key env://COSIGN_PRIVATE_KEY --recursive "${TAGS}@${DIGEST}"
89-
env:
90-
TAGS: ghcr.io/${{ github.repository }}:${{steps.dependencies.outputs.VERSION}}
91-
COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
92-
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
93-
DIGEST: ${{ steps.build-and-push.outputs.digest }}
45+
- name: "Set up Docker Buildx"
46+
if: ${{ steps.dependencies.outputs.VERSION != ''}}
47+
uses: docker/setup-buildx-action@v2
9448

49+
- name: Login to GHCR
50+
if: ${{ steps.dependencies.outputs.VERSION != ''}}
51+
uses: docker/login-action@v1
52+
with:
53+
registry: ghcr.io
54+
username: ${{ github.repository_owner }}
55+
password: ${{ secrets.GITHUB_TOKEN }}
56+
57+
- name: Build and push
58+
if: ${{ steps.dependencies.outputs.VERSION != ''}}
59+
uses: docker/build-push-action@v2
60+
id: build-and-push
61+
with:
62+
context: .
63+
build-args: |
64+
PALETTE_VERSION=${{env.PALETTE_VERSION}}
65+
PALETTE_CLI_VERSION=${{env.PALETTE_CLI_VERSION}}
66+
PALETTE_EDGE_VERSION=${{env.PALETTE_EDGE_VERSION}}
67+
PACKER_VERSION=${{env.PACKER_VERSION}}
68+
ORAS_VERSION=${{env.ORAS_VERSION}}
69+
TERRAFORM_VERSION=${{env.TERRAFORM_VERSION}}
70+
PALETTE_REGISTRY_CLI_VERSION=${{env.PALETTE_REGISTRY_CLI_VERSION}}
71+
platforms: linux/amd64,linux/arm64
72+
push: true
73+
tags: ghcr.io/${{ github.repository }}:${{steps.dependencies.outputs.VERSION}}
74+
75+
- uses: sigstore/[email protected]
76+
77+
- name: Image Signing
78+
if: ${{ steps.dependencies.outputs.VERSION != ''}}
79+
run: |
80+
cosign sign --yes \
81+
-a "repo=${{ github.repository }}" \
82+
-a "workflow=${{ github.workflow }}" \
83+
-a "ref=${{ github.sha }}" \
84+
-a "owner=Spectro Cloud" \
85+
--key env://COSIGN_PRIVATE_KEY --recursive "${TAGS}@${DIGEST}"
86+
env:
87+
TAGS: ghcr.io/${{ github.repository }}:${{steps.dependencies.outputs.VERSION}}
88+
COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
89+
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
90+
DIGEST: ${{ steps.build-and-push.outputs.digest }}
9591

9692
release:
9793
name: "Release"
@@ -113,4 +109,4 @@ jobs:
113109
env:
114110
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
115111
run: |
116-
npx semantic-release
112+
npx semantic-release

‎.github/workflows/test.yaml‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@ on:
77
env:
88
GITHUB_TOKEN: ${{ github.token }}
99
PALETTE_VERSION: 4.0.2
10-
PALETTE_CLI_VERSION: 4.0.1
11-
PALETTE_EDGE_VERSION: 3.4.3
10+
PALETTE_CLI_VERSION: 4.2.2
11+
PALETTE_EDGE_VERSION: 4.2.3
1212
PACKER_VERSION: 1.9.4
1313
ORAS_VERSION: 1.0.0
14-
TERRAFORM_VERSION: 1.6.5
14+
TERRAFORM_VERSION: 1.7.0
15+
PALETTE_REGISTRY_CLI_VERSION: 4.2.0
1516

1617
concurrency:
1718
group: docker-${{ github.ref }}
1819
cancel-in-progress: true
1920

20-
21-
2221
jobs:
2322
run-ci:
2423
runs-on: ubuntu-latest
@@ -27,9 +26,9 @@ jobs:
2726
shell: bash
2827
if: ${{ !github.event.pull_request.draft }}
2928
steps:
30-
# If the condition above is not met, aka, the PR is not in draft status, then this step is skipped.
31-
# Because this step is part of the critical path, omission of this step will result in remaining CI steps not gettinge executed.
32-
# As of 8/8/2022 there is now way to enforce this beahvior in GitHub Actions CI.
29+
# If the condition above is not met, aka, the PR is not in draft status, then this step is skipped.
30+
# Because this step is part of the critical path, omission of this step will result in remaining CI steps not gettinge executed.
31+
# As of 8/8/2022 there is now way to enforce this beahvior in GitHub Actions CI.
3332
- run: exit 0
3433

3534
docker:
@@ -50,14 +49,12 @@ jobs:
5049
- name: Install dependencies
5150
run: npm ci
5251

53-
5452
- name: Set up QEMU
5553
uses: docker/setup-qemu-action@v2
5654

5755
- name: Set up Docker Buildx
5856
uses: docker/setup-buildx-action@v2
5957

60-
6158
- name: Login to GHCR
6259
uses: docker/login-action@v1
6360
with:
@@ -79,5 +76,4 @@ jobs:
7976
PACKER_VERSION=${{env.PACKER_VERSION}}
8077
ORAS_VERSION=${{env.ORAS_VERSION}}
8178
TERRAFORM_VERSION=${{env.TERRAFORM_VERSION}}
82-
83-
79+
PALETTE_REGISTRY_CLI_VERSION=${{env.PALETTE_REGISTRY_CLI_VERSION}}

‎Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ ADD static/defaults/registry-config.yml etc/spectro/config.yml
2020

2121
ARG PALETTE_CLI_VERSION
2222
ARG PALETTE_EDGE_VERSION
23+
ARG PALETTE_REGISTRY_CLI_VERSION
2324
ARG PACKER_VERSION
2425
ARG ORAS_VERSION
2526
ARG TERRAFORM_VERSION
@@ -36,7 +37,7 @@ RUN adduser -H -u 1002 -D appuser appuser && \
3637
apk update && \
3738
apk add --no-cache bash curl git openssl jq bind-tools wget ca-certificates nano aws-cli xorriso govc podman
3839

39-
RUN wget https://software.spectrocloud.com/spectro-registry/cli/v$PALETTE_CLI_VERSION/linux/spectro && \
40+
RUN wget https://spectro-cli.s3.amazonaws.com/v$PALETTE_REGISTRY_CLI_VERSION/linux/spectro && \
4041
mv spectro /usr/local/bin/spectro && \
4142
chmod +x /usr/local/bin/spectro && \
4243
wget https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz && \

‎docs/docker.md‎

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,35 @@ You can start the container using the following command.
1212
docker run -p 5000:5000 --rm -it ghcr.io/spectrocloud/tutorials:1.0.12 bash
1313
```
1414

15-
1615
> The Docker file is build for a Linux environment. You can use this on a Mac and Windows. Windows users will require the usage of WSL2.
1716
18-
1917
The Docker image includes the following tools.
2018

21-
| Tool | Description |
22-
|---------------|----------------------------------------------------------------|
23-
| `terraform` | Infrastructure as code tool |
24-
| `palette cli` | The offical Palette CLI |
25-
| `spectro cli` | Spectro Cloud command-line interface |
26-
| `palette edge cli`| The Edge Installer CLU |
27-
| `spectro registry server` | Spectro Cloud Registry Server |
28-
| `ngrok` | Secure tunnels to localhost |
29-
| `kubectl` | Kubernetes command-line tool |
30-
| `bash` | Unix shell |
31-
| `curl` | Command line tool and library for transferring data with URLs |
32-
| `git` | Distributed version control system |
33-
| `openssl` | Toolkit for the Transport Layer Security (TLS) protocol |
34-
| `jq` | Lightweight and flexible command-line JSON processor |
35-
| `bind-tools` | Collection of DNS utilities, including dig, nslookup, and host |
36-
| `wget` | Free utility for non-interactive download of files from the Web|
37-
| `nano` | A text editior alternative to Vi. |
38-
| `ca-certificates` | Common set of CA certificates |
39-
| `canvos` | A utility for creating Edge artifacts |
40-
| `nano` | A text editior for Unix-like computing systems or operating environments using a command line interface|
41-
| `packer` | Hashicorp Image Builder for building Edge Native images |
42-
| `GOVC` | Tool for interracting with VMware Vsphere via API |
43-
| `aws-cli` | AWS command-line interface |
44-
| `oras` | Tool for pushing and pulling OCI artifacts to and from OCI registries|
45-
| `podman` | Tool for building and deploying OCI images |
19+
| Tool | Description |
20+
| ------------------------- | ------------------------------------------------------------------------------------------------------- |
21+
| `terraform` | Infrastructure as code tool |
22+
| `palette cli` | The offical Palette CLI |
23+
| `spectro cli` | Spectro Cloud command-line interface |
24+
| `palette edge cli` | The Edge Installer CLU |
25+
| `spectro registry server` | Spectro Cloud Registry Server |
26+
| `ngrok` | Secure tunnels to localhost |
27+
| `kubectl` | Kubernetes command-line tool |
28+
| `bash` | Unix shell |
29+
| `curl` | Command line tool and library for transferring data with URLs |
30+
| `git` | Distributed version control system |
31+
| `openssl` | Toolkit for the Transport Layer Security (TLS) protocol |
32+
| `jq` | Lightweight and flexible command-line JSON processor |
33+
| `bind-tools` | Collection of DNS utilities, including dig, nslookup, and host |
34+
| `wget` | Free utility for non-interactive download of files from the Web |
35+
| `nano` | A text editior alternative to Vi. |
36+
| `ca-certificates` | Common set of CA certificates |
37+
| `canvos` | A utility for creating Edge artifacts |
38+
| `nano` | A text editior for Unix-like computing systems or operating environments using a command line interface |
39+
| `packer` | Hashicorp Image Builder for building Edge Native images |
40+
| `GOVC` | Tool for interracting with VMware Vsphere via API |
41+
| `aws-cli` | AWS command-line interface |
42+
| `oras` | Tool for pushing and pulling OCI artifacts to and from OCI registries |
43+
| `podman` | Tool for building and deploying OCI images |
4644

4745
### Spectro Cloud Pack Registry Server
4846

@@ -52,19 +50,17 @@ The Spectro Cloud registry server has the following credentials:
5250

5351
- `password`: `admin`
5452

55-
You can start the registry server by issuing the following command.
53+
You can start the registry server by issuing the following command.
5654
Keep in mind that the registry server is started in HTTP mode. For additional guidance, review the [Registry Server documentation](https://docs.spectrocloud.com/registries-and-packs/adding-a-custom-registry).
5755

5856
```shell
5957
registry serve /etc/spectro/config.yml > /var/log/registry.log 2>&1 &
6058
```
6159

62-
6360
# Local Builds
6461

65-
If you are wanting to build the docker image locally you must provide the the build arguments for `PALETTE_VERSION`, `PALETTE_CLI_VERSION`, `PALETTE_EDGE_VERSION`, `PACKER_VERSION`, `ORAS_VERSION` and `TERRAFORM_VERSION`. Use the following command to build a local image. Replace the versions as needed.
66-
62+
If you are wanting to build the docker image locally you must provide the the build arguments for `PALETTE_VERSION`, `PALETTE_CLI_VERSION`, `PALETTE_EDGE_VERSION`, `PACKER_VERSION`, `ORAS_VERSION` and `TERRAFORM_VERSION`. Use the following command to build a local image. Replace the versions as needed.
6763

6864
```shell
69-
docker build --build-arg PALETTE_VERSION=4.0.2 --build-arg PALETTE_CLI_VERSION=4.0.1 --build-arg PALETTE_EDGE_VERSION=3.4.3 --build-arg PACKER_VERSION=1.9.4 --build-arg ORAS_VERSION=1.0.0 --build-arg TERRAFORM_VERSION=1.6.5 -t tutorials .
70-
```
65+
docker build --build-arg PALETTE_VERSION=4.0.2 --build-arg PALETTE_CLI_VERSION=4.2.2 --build-arg PALETTE_EDGE_VERSION=4.2.3 --build-arg PACKER_VERSION=1.9.4 --build-arg ORAS_VERSION=1.0.0 --build-arg PALETTE_REGISTRY_CLI_VERSION=4.2.0 --build-arg TERRAFORM_VERSION=1.7.0 -t tutorials .
66+
```

0 commit comments

Comments
 (0)