Skip to content

Commit

Permalink
Merge pull request #39 from udx/develop-vova
Browse files Browse the repository at this point in the history
Develop vova -> master
  • Loading branch information
planv authored Aug 29, 2024
2 parents 95d4029 + 4c6131e commit b4147b0
Show file tree
Hide file tree
Showing 7 changed files with 2,408 additions and 11 deletions.
5 changes: 4 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
Makefile
Makefile

# Ignore generated credentials from google-github-actions/auth
gha-creds-*.json
13 changes: 7 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,6 @@ jobs:
# helper for authentication
- run: |-
gcloud --quiet auth configure-docker $AR_LOCATION-docker.pkg.dev
# Get the GKE credentials so we can deploy to the cluster
- uses: google-github-actions/get-gke-credentials@v2
with:
cluster_name: ${{ env.GKE_CLUSTER }}
location: ${{ env.GKE_REGION }}
project_id: ${{ secrets.GKE_PROJECT }}
# Build the Docker image
- name: Build
Expand Down Expand Up @@ -162,6 +156,13 @@ jobs:
prerelease: false
files: |
./sbom.spdx.json
# Get the GKE credentials so we can deploy to the cluster
- uses: google-github-actions/get-gke-credentials@v2
with:
cluster_name: ${{ env.GKE_CLUSTER }}
location: ${{ env.GKE_REGION }}
project_id: ${{ secrets.GKE_PROJECT }}

# Set up kustomize
- name: Set up Kustomize
Expand Down
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,9 @@ Temporary Items
/newrelic_agent.log
.idea
static/kuberentes-ca.crt
docker-compose.yml
docker-compose.yml

# Ignore generated credentials from google-github-actions/auth
gha-creds-*.json

node_modules
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.6.0-alpine
FROM node:22.7.0-alpine
ENV VERSION=v1.31.0
ENV NODE_ENV=production
ENV SERVICE_ENABLE_SSHD=true
Expand Down
5 changes: 5 additions & 0 deletions changes.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### 0.5.0
* Upgraded parent Docker Image to `node:22.7.0-alpine`
* Improved `GitHub Action workflow` and removed sensitive data from Docker Image
* Updated `axios` to `1.7.5`

### 0.4.0
* Upgraded parent Docker image to `node:22`
* Upgraded `kubectl` to `1.31.0`
Expand Down
Loading

0 comments on commit b4147b0

Please sign in to comment.