From bebfa210c09d3332aae94b345d154c0fab6d7edc Mon Sep 17 00:00:00 2001
From: Karl Cardenas <karl@spectrocloud.com>
Date: Wed, 20 Sep 2023 17:22:17 -0700
Subject: [PATCH] * fix: release new docker image dependencies

* chore: updated gitignore

* ci: fix image version

* ci: fixed incorrect version
---
 .github/workflows/release.yaml |  6 +++---
 .github/workflows/test.yaml    |  4 ++--
 .gitignore                     |  1 +
 Dockerfile                     |  5 +++--
 Makefile                       | 12 ++++++++++--
 docs/docker.md                 | 11 ++---------
 6 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 71cc7e0..acc4e45 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -6,8 +6,8 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  PALETTE_VERSION: 3.4.0
-  PALETTE_CLI_VERSION: 3.4.0
+  PALETTE_VERSION: 4.0.2
+  PALETTE_CLI_VERSION: 4.0.1
   PALETTE_EDGE_VERSION: 3.4.3
 
 
@@ -27,7 +27,7 @@ jobs:
         node-version: '18'
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     -
       name: "Get dependencies"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 9418af4..96624d4 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -6,8 +6,8 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ github.token }}
-  PALETTE_VERSION: 3.4.0
-  PALETTE_CLI_VERSION: 3.4.0
+  PALETTE_VERSION: 4.0.2
+  PALETTE_CLI_VERSION: 4.0.1
   PALETTE_EDGE_VERSION: 3.4.3
 
 concurrency:
diff --git a/.gitignore b/.gitignore
index 29319d9..ef72966 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,5 +36,6 @@ override.tf.json
 .DS_Store
 my.*.tfvars
 .terraform.lock.hcl
+*.env
 
 
diff --git a/Dockerfile b/Dockerfile
index fae5351..53e1a32 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,9 +14,10 @@ ADD  static/defaults/htpasswd-basic /auth/htpasswd-basic
 ADD  static/defaults/ngrok.yml /auth/ngrok.yml
 ADD  static/defaults/registry-config.yml etc/spectro/config.yml
 
+
 ARG PALETTE_CLI_VERSION
 ARG PALETTE_EDGE_VERSION
-ARG PACKER_VERSION=1.8.7
+ARG PACKER_VERSION=1.9.4
 
 ENV REGISTRY_LOG_LEVEL=info
 ENV REGISTRY_AUTH=htpasswd
@@ -30,7 +31,7 @@ RUN adduser -H -u 1002 -D appuser appuser && \
     apk update && \
     apk add --no-cache bash curl git terraform openssl jq bind-tools wget ca-certificates nano
 
-RUN  wget https://software.spectrocloud.com/spectro-registry/v$PALETTE_CLI_VERSION/cli/linux/spectro && \
+RUN  wget https://software.spectrocloud.com/spectro-registry/cli/v$PALETTE_CLI_VERSION/linux/spectro && \
         mv spectro /usr/local/bin/spectro && \
         chmod +x /usr/local/bin/spectro && \
         wget https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz && \
diff --git a/Makefile b/Makefile
index 5a629df..01ce314 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,14 @@
-init: 
+init: ## Install dependencies and setup the project
+	@echo "initializing npm dependencies"
 	npm ci
+	npx husky install
 
-build-docker:
+
+help: ## Display this help
+	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[0m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
+
+
+
+build-docker: ## Build docker image
 	@echo "Building docker image"
 	docker build --build-arg PALETTE_VERSION=$(VERSION) --build-arg PALETTE_CLI_VERSION=$(VERSION) --build-arg PALETTE_EDGE_VERSION=$(EDGE) --build-arg PACKER_VERSION=1.8.7 -t tutorials .
\ No newline at end of file
diff --git a/docs/docker.md b/docs/docker.md
index 5a266be..9aa7a27 100644
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -63,12 +63,5 @@ If you are wanting to build the docker image locally you must provide the the bu
 
 
 ```shell
-make build-docker VERSION=3.4.0 EDGE=3.4.3
-```
-
-OR
-
-```shell
-docker build --build-arg PALETTE_VERSION=3.3.0 --build-arg PALETTE_CLI_VERSION=3.4.0  --build-arg PALETTE_EDGE_VERSION=3.4.3 --build-arg PACKER_VERSION=1.8.7 -t tutorials .
-```
-
+docker build --build-arg PALETTE_VERSION=4.0.1 --build-arg PALETTE_CLI_VERSION=4.0.1  --build-arg PALETTE_EDGE_VERSION=3.4.3 --build-arg PACKER_VERSION=1.9.4 -t tutorials .
+```
\ No newline at end of file