Switched to using the npmjs registry version of our package, removed …

…github registry information (#35)
digicatapult · Jul 14, 2022 · b471c06 · b471c06
1 parent 7d87632
commit b471c06
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 42 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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",