Merge branch 'master' of https://github.com/SquirrelCorporation/Squir…

…relServersManager
SquirrelCorporation · Jun 6, 2024 · 4f53227 · 4f53227
2 parents e48a23d + a5a39ff
commit 4f53227
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 95 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -16,7 +16,6 @@ env:
   # github.repository as <account>/<repo>
   SERVER_IMAGE_NAME: ${{ github.repository }}-server
   CLIENT_IMAGE_NAME: ${{ github.repository }}-client
-  PROXY_IMAGE_NAME: ${{ github.repository }}-proxy
 
 jobs:
   build-and-publish-server:
@@ -190,85 +189,3 @@ jobs:
         # This step uses the identity token to provision an ephemeral certificate
         # against the sigstore community Fulcio instance.
         run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
-
-  build-and-publish-proxy:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        platform:
-          - linux/arm64/v8
-          - linux/amd64
-    permissions:
-      contents: read
-      packages: write
-      # This is used to complete the identity challenge
-      # with sigstore/fulcio when running outside of PRs.
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      # Install the cosign tool except on PR
-      # https://github.com/sigstore/cosign-installer
-      - name: Install cosign
-        if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
-        with:
-          cosign-release: 'v2.2.4'
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      # Set up BuildKit Docker container builder to be able to build
-      # multi-platform images and export cache
-      # https://github.com/docker/setup-buildx-action
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
-
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
-      - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.PROXY_IMAGE_NAME }}
-
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
-        with:
-          context: ./proxy
-          platforms: ${{ matrix.platform }}
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      # Sign the resulting Docker image digest except on PRs.
-      # This will only write to the public Rekor transparency log when the Docker
-      # repository is public to avoid leaking data.  If you would like to publish
-      # transparency data even for private images, pass --force to cosign below.
-      # https://github.com/sigstore/cosign
-      - name: Sign the published Docker image
-        if: ${{ github.event_name != 'pull_request' }}
-        env:
-          # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
-          TAGS: ${{ steps.meta.outputs.tags }}
-          DIGEST: ${{ steps.build-and-push.outputs.digest }}
-        # This step uses the identity token to provision an ephemeral certificate
-        # against the sigstore community Fulcio instance.
-        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
diff --git a/client/package.json b/client/package.json
@@ -52,7 +52,7 @@
     "@ant-design/use-emotion-css": "1.0.4",
     "@umijs/route-utils": "^4.0.1",
     "@ant-design/charts": "^2.1.1",
-    "antd": "^5.17.4",
+    "antd": "^5.18.0",
     "classnames": "^2.5.1",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
@@ -68,7 +68,7 @@
     "@monaco-editor/react": "^4.6.0",
     "dayjs": "^1.11.11",
     "@dotlottie/react-player": "^1.6.19",
-    "@umijs/max": "^4.2.8",
+    "@umijs/max": "^4.2.10",
     "umi-presets-pro": "^2.0.3",
     "@umijs/plugin-antd-dayjs": "^0.3.0",
     "umi-serve": "^1.9.11",
@@ -85,7 +85,7 @@
     "antd-pro-merge-less": "^3.0.11",
     "@ant-design/pro-cli": "^3.2.1",
     "@ant-design/plots": "^2.2.2",
-    "@testing-library/react": "^15.0.7",
+    "@testing-library/react": "^16.0.0",
     "@types/classnames": "^2.3.1",
     "@types/express": "^4.17.21",
     "@types/history": "^5.0.0",
@@ -96,23 +96,23 @@
     "@types/react-dom": "^18.3.0",
     "@types/react-helmet": "^6.1.11",
     "@umijs/fabric": "^4.0.1",
-    "@umijs/lint": "^4.2.8",
+    "@umijs/lint": "^4.2.10",
     "cross-env": "^7.0.3",
     "eslint": "^8.57.0",
     "express": "^4.19.2",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^15.2.5",
     "mockjs": "^1.1.0",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.1",
     "swagger-ui-dist": "^5.17.14",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5",
-    "@typescript-eslint/parser": "^7.11.0",
-    "@typescript-eslint/eslint-plugin": "^7.11.0",
+    "@typescript-eslint/parser": "^7.12.0",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
     "eslint-plugin-react": "^7.34.2",
     "eslint-plugin-jest": "^28.5.0",
-    "@babel/eslint-plugin": "^7.24.6",
+    "@babel/eslint-plugin": "^7.24.7",
     "eslint-plugin-react-hooks": "^4.6.2"
 
   },

diff --git a/server/package.json b/server/package.json
@@ -26,7 +26,7 @@
     "joi": "^17.13.1",
     "jsonwebtoken": "^9.0.2",
     "luxon": "^3.4.4",
-    "mongoose": "^8.4.0",
+    "mongoose": "^8.4.1",
     "node-cron": "^3.0.3",
     "node-ssh": "^13.2.0",
     "parse-docker-image-name": "^3.0.0",
@@ -44,7 +44,7 @@
     "semver": "^7.6.2",
     "shelljs": "^0.8.5",
     "ssm-shared-lib": "file:../shared-lib/",
-    "@aws-sdk/client-ecr": "^3.588.0"
+    "@aws-sdk/client-ecr": "^3.590.0"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.2",
@@ -70,7 +70,7 @@
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-prettier": "^5.1.3",
     "node-mocks-http": "^1.14.1",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5",
     "vitest": "^1.6.0"

diff --git a/site/package.json b/site/package.json
@@ -9,6 +9,6 @@
     "preview": "vitepress preview"
   },
   "devDependencies": {
-    "vitepress": "^1.2.2"
+    "vitepress": "^1.2.3"
   }
 }