From 8109add164a7c32cb88486fa3fce2a6575d48f9d Mon Sep 17 00:00:00 2001 From: Refringe Date: Mon, 11 Mar 2024 13:25:29 -0400 Subject: [PATCH] Adds jq tool to the node image --- .gitea/workflows/build.yaml | 6 +++--- Dockerfile.node | 3 ++- README.md | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index e3a4ccf..28313de 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -43,7 +43,7 @@ jobs: if: needs.check-tag-exists.outputs.proceed == 'true' runs-on: ubuntu-latest container: - image: refringe/spt-build-node:1.0.4 + image: refringe/spt-build-node:1.0.5 outputs: build_type: ${{ steps.build-type.outputs.build_type }} steps: @@ -262,7 +262,7 @@ jobs: needs: [check-tag-exists, build-server, build-modules, build-launcher] runs-on: ubuntu-latest container: - image: refringe/spt-build-node:1.0.4 + image: refringe/spt-build-node:1.0.5 outputs: build_name: ${{ steps.generate-filename.outputs.build_name }} steps: @@ -336,7 +336,7 @@ jobs: needs: [assemble-release, determine-build-type] runs-on: ubuntu-latest container: - image: refringe/spt-build-node:1.0.4 + image: refringe/spt-build-node:1.0.5 steps: - name: Download Release Artifact uses: actions/download-artifact@v3 diff --git a/Dockerfile.node b/Dockerfile.node index 0cde66d..9a5a2f7 100644 --- a/Dockerfile.node +++ b/Dockerfile.node @@ -7,6 +7,7 @@ FROM node:20.10.0-bookworm # - git-lfs (duh) # - zstd (caching action dependancy) # - tree (pretty print build directory structure) +# - jq (working with JSON) # - p7zip-full (the goat) # - sshpass (for automated SSH authentication) # - lftp (for automated SFTP commands) @@ -14,7 +15,7 @@ FROM node:20.10.0-bookworm # - python3-pip (for installing python packages) # - python3-venv (for creating python virtual environments) RUN apt-get update && \ - apt-get install -y wget git git-lfs zstd tree p7zip-full sshpass python3 python3-pip python3-venv + apt-get install -y wget git git-lfs zstd tree jq p7zip-full sshpass python3 python3-pip python3-venv # Create a virtual environment for Python packages RUN python3 -m venv /opt/venv diff --git a/README.md b/README.md index 25e762f..0d702bf 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Be sure to update the version number to the next available version before buildi ``` # Build and push the spt-build-node Docker image to the Docker Hub -docker build -t refringe/spt-build-node:1.0.5 -t refringe/spt-build-node:latest -f Dockerfile.node . +docker build -t refringe/spt-build-node:1.0.6 -t refringe/spt-build-node:latest -f Dockerfile.node . docker push refringe/spt-build-node --all-tags # Build and push the spt-build-dotnet Docker image to the Docker Hub