From eedd43e31f4212e8c1127b90783790e5844ef839 Mon Sep 17 00:00:00 2001 From: Karl Cardenas Date: Fri, 31 May 2024 13:53:33 -0700 Subject: [PATCH 1/3] fix: updated dependencies --- .github/workflows/test.yaml | 10 +++++----- edge/vmware/packer/build.pkr.hcl | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 034cbc0..373f8cf 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,12 +7,12 @@ on: env: GITHUB_TOKEN: ${{ github.token }} PALETTE_VERSION: 4.0.2 - PALETTE_CLI_VERSION: 4.2.2 - PALETTE_EDGE_VERSION: 4.2.3 - PACKER_VERSION: 1.9.4 + PALETTE_CLI_VERSION: 4.3.7 + PALETTE_EDGE_VERSION: 4.3.2 + PACKER_VERSION: 1.11.0 ORAS_VERSION: 1.0.0 - TERRAFORM_VERSION: 1.7.0 - PALETTE_REGISTRY_CLI_VERSION: 4.2.0 + TERRAFORM_VERSION: 1.8.4 + PALETTE_REGISTRY_CLI_VERSION: 4.3.0 concurrency: group: docker-${{ github.ref }} diff --git a/edge/vmware/packer/build.pkr.hcl b/edge/vmware/packer/build.pkr.hcl index 96141cc..ed4c8c3 100644 --- a/edge/vmware/packer/build.pkr.hcl +++ b/edge/vmware/packer/build.pkr.hcl @@ -200,6 +200,9 @@ source "vsphere-iso" "edge-template" { RAM_hot_plug = false cdrom_type = var.vm_cdrom_type disk_controller_type = var.vm_disk_controller_type + remote_cache_cleanup = true + local_cache_overwrite = true + remote_cache_overwrite = true storage { disk_size = var.vm_disk_size @@ -212,7 +215,7 @@ source "vsphere-iso" "edge-template" { network_card = var.vm_network_card } disable_shutdown = true - shutdown_timeout = "10m" + shutdown_timeout = "20m" communicator = "none" iso_url = "${path.cwd}/${var.iso}" iso_checksum = "file:file://${path.cwd}/${var.iso_checksum}" From 90c24722573fac2604965dfc4368b435ddf59378 Mon Sep 17 00:00:00 2001 From: Karl Cardenas Date: Fri, 31 May 2024 13:58:20 -0700 Subject: [PATCH 2/3] ci: update dependencies --- .github/workflows/release.yaml | 20 ++++++++++---------- .github/workflows/test.yaml | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9f82e26..7a1ac31 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -7,12 +7,12 @@ on: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PALETTE_VERSION: 4.0.2 - PALETTE_CLI_VERSION: 4.2.2 - PALETTE_EDGE_VERSION: 4.2.3 - PACKER_VERSION: 1.9.4 + PALETTE_CLI_VERSION: 4.3.7 + PALETTE_EDGE_VERSION: 4.3.2 + PACKER_VERSION: 1.11.0 ORAS_VERSION: 1.0.0 - TERRAFORM_VERSION: 1.7.0 - PALETTE_REGISTRY_CLI_VERSION: 4.2.0 + TERRAFORM_VERSION: 1.8.4 + PALETTE_REGISTRY_CLI_VERSION: 4.3.0 jobs: docker: @@ -22,9 +22,9 @@ jobs: VERSION: ${{ steps.get-version.outputs.version }} steps: - name: Setup nodeJs - uses: actions/setup-node@v1.4.4 + uses: actions/setup-node@v4 with: - node-version: "18" + node-version: "20" - name: Check out code into the Go module directory uses: actions/checkout@v4 @@ -44,11 +44,11 @@ jobs: - name: "Set up Docker Buildx" if: ${{ steps.dependencies.outputs.VERSION != ''}} - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3.3.0 - name: Login to GHCR if: ${{ steps.dependencies.outputs.VERSION != ''}} - uses: docker/login-action@v1 + uses: docker/login-action@v3.2.0 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -56,7 +56,7 @@ jobs: - name: Build and push if: ${{ steps.dependencies.outputs.VERSION != ''}} - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5.3.0 id: build-and-push with: context: . diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 373f8cf..6513507 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -39,12 +39,12 @@ jobs: steps: - id: checkout name: Checkout Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Nodejs - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18 + node-version: "20" - name: Install dependencies run: npm ci @@ -53,17 +53,17 @@ jobs: uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3.3.0 - name: Login to GHCR - uses: docker/login-action@v1 + uses: docker/login-action@v3.2.0 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and Push Docker Image - uses: docker/build-push-action@v4.0.0 + uses: docker/build-push-action@v5.3.0 with: context: . platforms: linux/amd64,linux/arm64 From 150a1a83eaeaab822832a0b14f8b5a005d9451b5 Mon Sep 17 00:00:00 2001 From: Karl Cardenas Date: Fri, 31 May 2024 14:00:14 -0700 Subject: [PATCH 3/3] chore: updated docker file --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index f9268ff..8441007 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,4 +72,6 @@ RUN unzip /usr/local/sbin/packer_${PACKER_VERSION}_linux_amd64.zip -d /usr/local rm -rf /usr/local/sbin/packer_${PACKER_VERSION}_linux_amd64.zip EXPOSE 5000 +USER appuser + CMD ["/bin/bash"] \ No newline at end of file