Updating deps, charts, added multi-arch-build (#61)

* Updating deps, charts, added multi-arch-build
* Updated tests

.github/workflows/release.yml

@@ -76,19 +76,36 @@ jobs:
  - name: Set up chart-testing
  uses: helm/[email protected]
  - name: Setup Minikube
- uses: manusa/actions-setup-minikube@v2.3.0
+ uses: manusa/actions-setup-minikube@v2.7.1
  with:
  minikube version: 'v1.17.1'
  kubernetes version: 'v1.19.2'
  - name: Login to minikube docker registry
  run: eval $(minikube -p minikube docker-env)
- - name: Build and Publish image
+ - name: Build Multi-arch
+ uses: docker/build-push-action@v3
+ with:
+ builder: ${{ steps.buildx.outputs.name }}
+ context: .
+ load: false
+ file: ./Dockerfile
+ platforms: linux/amd64, linux/arm64
+ tags: |
+ ${{ needs.preconditions.outputs.repo_name }}:latest
+ labels: |
+ org.opencontainers.image.title=${{ needs.preconditions.outputs.repo_name }}
+ org.opencontainers.image.description=${{ github.event.repository.description }}
+ org.opencontainers.image.source=${{ github.event.repository.html_url }}
+ org.opencontainers.image.url=${{ github.event.repository.html_url }}
+ org.opencontainers.image.revision=${{ github.sha }}
+ - name: Load and push image for testing
  uses: docker/build-push-action@v3
  with:
  builder: ${{ steps.buildx.outputs.name }}
  context: .
  load: true
  file: ./Dockerfile
+ platforms: linux/amd64
  tags: |
  ${{ needs.preconditions.outputs.repo_name }}:latest
  labels: |
@@ -250,7 +267,7 @@ jobs:
  builder: ${{ steps.buildx.outputs.name }}
  context: .
  file: ./Dockerfile
- platforms: linux/amd64
+ platforms: linux/amd64, linux/arm64
  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 }}

.github/workflows/tests.yml

@@ -70,19 +70,36 @@ jobs:
  - name: Set up chart-testing
  uses: helm/[email protected]
  - name: Setup Minikube
- uses: manusa/actions-setup-minikube@v2.3.0
+ uses: manusa/actions-setup-minikube@v2.7.1
  with:
  minikube version: 'v1.17.1'
  kubernetes version: 'v1.19.2'
  - name: Login to minikube docker registry
  run: eval $(minikube -p minikube docker-env)
- - name: Build and Publish image
+ - name: Build Multi-arch
+ uses: docker/build-push-action@v3
+ with:
+ builder: ${{ steps.buildx.outputs.name }}
+ context: .
+ load: false
+ file: ./Dockerfile
+ platforms: linux/amd64, linux/arm64
+ tags: |
+ ${{ needs.repo_ids.outputs.repo_name }}:latest
+ labels: |
+ org.opencontainers.image.title=${{ needs.repo_ids.outputs.repo_name }}
+ org.opencontainers.image.description=${{ github.event.repository.description }}
+ org.opencontainers.image.source=${{ github.event.repository.html_url }}
+ org.opencontainers.image.url=${{ github.event.repository.html_url }}
+ org.opencontainers.image.revision=${{ github.sha }}
+ - name: Load and push image for testing
  uses: docker/build-push-action@v3
  with:
  builder: ${{ steps.buildx.outputs.name }}
  context: .
  load: true
  file: ./Dockerfile
+ platforms: linux/amd64
  tags: |
  ${{ needs.repo_ids.outputs.repo_name }}:latest
  labels: |

Dockerfile

@@ -1,7 +1,8 @@
 FROM node:16-alpine
 
 COPY . .
-
+ARG TARGETPLATFORM
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then apk add --no-cache python3 make g++; fi
 RUN npm install -g [email protected]
 
 RUN npm ci --prod

docker-compose.yaml

@@ -1,7 +1,7 @@
 version: '3'
 services:
  ipfs:
- image: ipfs/go-ipfs:v0.13.1
+ image: ipfs/go-ipfs:v0.16.0
  environment:
  - |
  IPFS_SWARM_KEY=/key/swarm/psk/1.0.0/
@@ -12,7 +12,7 @@ services:
  - 8080:8080
  - 5001:5001
  ipfs-2:
- image: ipfs/go-ipfs:v0.13.1
+ image: ipfs/go-ipfs:v0.16.0
  environment:
  - |
  IPFS_SWARM_KEY=/key/swarm/psk/1.0.0/

helm/dscp-api/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: dscp-node
  repository: https://digicatapult.github.io/dscp-node/
- version: 4.2.1
+ version: 4.4.6
 - name: dscp-ipfs
  repository: https://digicatapult.github.io/dscp-ipfs/
- version: 2.6.1
-digest: sha256:5a53d52e877741408a0c446ea2bd0f2d618a4cbab3b4b607b87f6cbc3a10bcf5
-generated: "2022-07-21T10:34:29.668579+01:00"
+ version: 2.6.3
+digest: sha256:6b5d7ca4028948880f3b9cd87d151f67fdfea56a6ff7276656e5cac143a9d151
+generated: "2022-11-18T11:05:37.827523Z"

helm/dscp-api/Chart.yaml

@@ -1,18 +1,18 @@
 apiVersion: v2
 name: dscp-api
-appVersion: '4.6.9'
+appVersion: '4.7.0'
 description: A Helm chart for dscp-api
-version: '4.6.9'
+version: '4.7.0'
 type: application
 dependencies:
  - name: dscp-node
- version: '4.2.1'
+ version: '4.4.6'
  repository: https://digicatapult.github.io/dscp-node/
  condition: dscpNode.enabled
  alias: dscpNode
 
  - name: dscp-ipfs
- version: '2.6.1'
+ version: '2.6.3'
  repository: https://digicatapult.github.io/dscp-ipfs/
  condition: dscpIpfs.enabled
  alias: dscpIpfs

helm/dscp-api/values.yaml

@@ -38,7 +38,7 @@ service:
 image:
  repository: digicatapult/dscp-api
  pullPolicy: IfNotPresent
- tag: 'v4.6.9'
+ tag: 'v4.7.0'
 
 dscpNode:
  enabled: false