diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eec77d2..2622af3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,8 +89,6 @@ jobs: context: . load: true file: ./Dockerfile - secrets: | - github=${{ secrets.GITHUB_TOKEN }} tags: | ${{ needs.preconditions.outputs.repo_name }}:latest labels: | @@ -123,8 +121,6 @@ jobs: ${{ runner.OS }}- - name: Install Packages run: npm ci - env: - GITHUB_PACKAGE_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Lint run: npm run lint dependency-check: @@ -148,8 +144,6 @@ jobs: ${{ runner.OS }}- - name: Install Packages run: npm ci - env: - GITHUB_PACKAGE_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Dependency Check run: npm run depcheck tests: @@ -173,8 +167,6 @@ jobs: ${{ runner.OS }}- - name: Install Packages run: npm ci - env: - GITHUB_PACKAGE_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Setup dependencies run: docker-compose up -d - name: Sleep @@ -246,8 +238,6 @@ jobs: builder: ${{ steps.buildx.outputs.name }} context: . file: ./Dockerfile - secrets: | - github=${{ secrets.GITHUB_TOKEN }} platforms: linux/amd64 tags: | ghcr.io/${{ needs.preconditions.outputs.org_name }}/${{ needs.preconditions.outputs.repo_name }}:${{ needs.check-version.outputs.version }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 69cca6e..73484ea 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -83,8 +83,6 @@ jobs: context: . load: true file: ./Dockerfile - secrets: | - github=${{ secrets.GITHUB_TOKEN }} tags: | ${{ needs.repo_ids.outputs.repo_name }}:latest labels: | @@ -116,8 +114,6 @@ jobs: ${{ runner.OS }}- - name: Install Packages run: npm ci - env: - GITHUB_PACKAGE_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Lint run: npm run lint dependency-check: @@ -140,8 +136,6 @@ jobs: ${{ runner.OS }}- - name: Install Packages run: npm ci - env: - GITHUB_PACKAGE_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Dependency Check run: npm run depcheck @@ -165,8 +159,6 @@ jobs: ${{ runner.OS }}- - name: Install Packages run: npm ci - env: - GITHUB_PACKAGE_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Setup dependencies run: docker-compose up -d - name: Sleep diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 0ba73a4..0000000 --- a/.npmrc +++ /dev/null @@ -1,4 +0,0 @@ -registry=https://registry.npmjs.org/ -//npm.pkg.github.com/:_authToken=${GITHUB_PACKAGE_TOKEN} -@digicatapult:registry=https://npm.pkg.github.com -always-auth=true \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index b8024ee..2ba95d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ WORKDIR /dscp-ipfs # Install base dependencies COPY . . -RUN --mount=type=secret,id=github GITHUB_PACKAGE_TOKEN=$(cat /run/secrets/github) npm ci --production +RUN npm ci --production ENV IPFS_PATH=/ipfs diff --git a/helm/dscp-ipfs/Chart.lock b/helm/dscp-ipfs/Chart.lock index eecbc12..50edb43 100644 --- a/helm/dscp-ipfs/Chart.lock +++ b/helm/dscp-ipfs/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: dscp-node repository: https://digicatapult.github.io/dscp-node/ - version: 4.0.0 -digest: sha256:75cd1f032cbcfa1222df6c5058cb82e3933d6646f317d5111e3f4082bcd29306 -generated: "2022-07-12T13:42:53.570998+01:00" + version: 4.1.0 +digest: sha256:a950bd86eaea820ed79a8446872e3f7d3dc348a7ebb8b1941ec78353a2533937 +generated: "2022-07-14T15:39:22.314984+01:00" diff --git a/helm/dscp-ipfs/Chart.yaml b/helm/dscp-ipfs/Chart.yaml index 2312a5b..1a00cc4 100644 --- a/helm/dscp-ipfs/Chart.yaml +++ b/helm/dscp-ipfs/Chart.yaml @@ -1,12 +1,12 @@ apiVersion: v2 name: dscp-ipfs -appVersion: '2.3.0' +appVersion: '2.4.0' description: A Helm chart for dscp-ipfs -version: '2.3.0' +version: '2.4.0' type: application dependencies: - name: dscp-node - version: '4.0.0' + version: '4.1.0' repository: https://digicatapult.github.io/dscp-node/ condition: dscpNode.enabled alias: dscpNode diff --git a/helm/dscp-ipfs/values.yaml b/helm/dscp-ipfs/values.yaml index 137b1fa..ba90b14 100644 --- a/helm/dscp-ipfs/values.yaml +++ b/helm/dscp-ipfs/values.yaml @@ -51,7 +51,7 @@ statefulSet: image: repository: ghcr.io/digicatapult/dscp-ipfs pullPolicy: IfNotPresent - tag: 'v2.3.0' + tag: 'v2.4.0' storage: storageClass: "" diff --git a/package-lock.json b/package-lock.json index d90f03e..ef2991e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "@digicatapult/dscp-ipfs", - "version": "2.3.0", + "version": "2.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@digicatapult/dscp-ipfs", - "version": "2.3.0", + "version": "2.4.0", "license": "Apache-2.0", "dependencies": { - "@digicatapult/dscp-node": "^4.0.0", + "@digicatapult/dscp-node": "^4.1.0", "dotenv": "^8.2.0", "envalid": "^7.0.0", "express": "^4.17.1", @@ -398,12 +398,15 @@ } }, "node_modules/@digicatapult/dscp-node": { - "version": "4.0.0", - "resolved": "https://npm.pkg.github.com/download/@digicatapult/dscp-node/4.0.0/6623e70b033cc9b4b6e07093edf3f44c4134b9ae2025033001b46dfaf7d3d77f", - "integrity": "sha512-AzU7+CbDr+5HYwFIJwJSYgDSsBMgfL/gIJ8ZvPnK1AL+fdAGUAUpb66NamdBZuT9Kpuldjyaax/hKB7jGejvjQ==", - "license": "Apache-2.0", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@digicatapult/dscp-node/-/dscp-node-4.1.0.tgz", + "integrity": "sha512-/RevidwoWGvxQsvcMlSEWRsL4SLxvw5saw4To/BI3wAIBD5gy7ImAXM4yWhCZobSouhICi2Db34/kK4Gxzi7DQ==", "dependencies": { "@polkadot/api": "^8.11.3" + }, + "engines": { + "node": "16.x.x", + "npm": "8.x.x" } }, "node_modules/@eslint/eslintrc": { @@ -7269,9 +7272,9 @@ } }, "@digicatapult/dscp-node": { - "version": "4.0.0", - "resolved": "https://npm.pkg.github.com/download/@digicatapult/dscp-node/4.0.0/6623e70b033cc9b4b6e07093edf3f44c4134b9ae2025033001b46dfaf7d3d77f", - "integrity": "sha512-AzU7+CbDr+5HYwFIJwJSYgDSsBMgfL/gIJ8ZvPnK1AL+fdAGUAUpb66NamdBZuT9Kpuldjyaax/hKB7jGejvjQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@digicatapult/dscp-node/-/dscp-node-4.1.0.tgz", + "integrity": "sha512-/RevidwoWGvxQsvcMlSEWRsL4SLxvw5saw4To/BI3wAIBD5gy7ImAXM4yWhCZobSouhICi2Db34/kK4Gxzi7DQ==", "requires": { "@polkadot/api": "^8.11.3" } diff --git a/package.json b/package.json index 5f7c4b7..7a243a5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@digicatapult/dscp-ipfs", - "version": "2.3.0", + "version": "2.4.0", "description": "Service for WASP", "main": "app/index.js", "scripts": { @@ -31,7 +31,7 @@ }, "homepage": "https://github.com/digicatapult/dscp-ipfs#readme", "dependencies": { - "@digicatapult/dscp-node": "^4.0.0", + "@digicatapult/dscp-node": "^4.1.0", "dotenv": "^8.2.0", "envalid": "^7.0.0", "express": "^4.17.1",