Skip to content

Commit

Permalink
* fix: release new docker image dependencies
Browse files Browse the repository at this point in the history
* chore: updated gitignore

* ci: fix image version

* ci: fixed incorrect version
  • Loading branch information
karl-cardenas-coding authored Sep 21, 2023
1 parent e4cb9ab commit bebfa21
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 18 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@ override.tf.json
.DS_Store
my.*.tfvars
.terraform.lock.hcl
*.env


5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 && \
Expand Down
12 changes: 10 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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 .
11 changes: 2 additions & 9 deletions docs/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
```

0 comments on commit bebfa21

Please sign in to comment.