Skip to content

Commit

Permalink
Moved images to dockerhub (#36)
Browse files Browse the repository at this point in the history
* Moved images to dockerhub
* Change WASP to DSCP, update vuln packages
* Changes eslint to use a non-deprecated babel module
  • Loading branch information
dblane-digicatapult authored Jul 19, 2022
1 parent b471c06 commit b9ab8e2
Show file tree
Hide file tree
Showing 8 changed files with 346 additions and 547 deletions.
6 changes: 3 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"es6": true,
"node": true
},
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"parserOptions": {
"ecmaVersion": 9,
"sourceType": "module"
"sourceType": "module",
"requireConfigFile": false
},
"ignorePatterns": ["**/test/__fixtures__/**/*"],
"rules": {
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,16 @@ jobs:
with:
buildkitd-flags: '--debug'
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: $GITHUB_ACTOR
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Login to Dockerhub Registry
uses: docker/login-action@v2
with:
username: ${{ secrets.DSCP_DOCKERHUB_USERNAME }}
password: ${{ secrets.DSCP_DOCKERHUB_TOKEN }}
- name: Publish multi-arch image
uses: docker/build-push-action@v2
with:
Expand All @@ -241,7 +246,9 @@ jobs:
platforms: linux/amd64
tags: |
ghcr.io/${{ needs.preconditions.outputs.org_name }}/${{ needs.preconditions.outputs.repo_name }}:${{ needs.check-version.outputs.version }}
${{ needs.preconditions.outputs.org_name }}/${{ needs.preconditions.outputs.repo_name }}:${{ needs.check-version.outputs.version }}
ghcr.io/${{ needs.preconditions.outputs.org_name }}/${{ needs.preconditions.outputs.repo_name }}:latest
${{ needs.preconditions.outputs.org_name }}/${{ needs.preconditions.outputs.repo_name }}:latest
labels: |
org.opencontainers.image.title=${{ needs.preconditions.outputs.repo_name }}
org.opencontainers.image.description=${{ github.event.repository.description }}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
dscp-node:
image: ghcr.io/digicatapult/dscp-node:latest
image: digicatapult/dscp-node:latest
command:
--base-path /data/
--dev
Expand Down
6 changes: 3 additions & 3 deletions helm/dscp-ipfs/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: dscp-node
repository: https://digicatapult.github.io/dscp-node/
version: 4.1.0
digest: sha256:a950bd86eaea820ed79a8446872e3f7d3dc348a7ebb8b1941ec78353a2533937
generated: "2022-07-14T15:39:22.314984+01:00"
version: 4.2.1
digest: sha256:8b359b958a03de828d26a882411ed569157b898842fad62c683bdbef2b2ede4b
generated: "2022-07-18T17:08:40.939659+01:00"
6 changes: 3 additions & 3 deletions helm/dscp-ipfs/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: v2
name: dscp-ipfs
appVersion: '2.4.0'
appVersion: '2.5.0'
description: A Helm chart for dscp-ipfs
version: '2.4.0'
version: '2.5.0'
type: application
dependencies:
- name: dscp-node
version: '4.1.0'
version: '4.2.1'
repository: https://digicatapult.github.io/dscp-node/
condition: dscpNode.enabled
alias: dscpNode
Expand Down
4 changes: 2 additions & 2 deletions helm/dscp-ipfs/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ statefulSet:
enabled: true

image:
repository: ghcr.io/digicatapult/dscp-ipfs
repository: digicatapult/dscp-ipfs
pullPolicy: IfNotPresent
tag: 'v2.4.0'
tag: 'v2.5.0'

storage:
storageClass: ""
Expand Down
Loading

0 comments on commit b9ab8e2

Please sign in to comment.