Adds dockerhub release, updates to using new images in docker-compose (…

…#66)

.github/workflows/release.yml

@@ -15,12 +15,18 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Check token
+      - name: Check Github token
         run: |
           if [ -z "${{ secrets.GITHUB_TOKEN }}"]; then
             echo "Must provide a GITHUB_TOKEN secret in order to run release workflow"
             exit 1
           fi
+      - name: Check Dockerhub token
+        run: |
+          if [ -z "${{ secrets.DSCP_DOCKERHUB_TOKEN }}"]; then
+            echo "Must provide a DSCP_DOCKERHUB_TOKEN secret in order to run release workflow"
+            exit 1
+          fi
       - name: Get repository identifiers
         id: repo_ids
         run: |
@@ -226,11 +232,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
           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:
@@ -241,7 +252,9 @@ jobs:
           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 }}
             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 }}

docker-compose.yaml

@@ -26,7 +26,7 @@ services:
       - POSTGRES_DB=dscp
 
   dscp-identity-service:
-    image: ghcr.io/digicatapult/dscp-identity-service:v1.5.0
+    image: digicatapult/dscp-identity-service:latest
     container_name: identity-service
     command: /bin/sh -c "
       sleep 30 &&
@@ -37,10 +37,6 @@ services:
     environment:
       - PORT=3002
       - API_HOST=dscp-node
-      - AUTH_JWKS_URI=https://inteli.eu.auth0.com/.well-known/jwks.json
-      - AUTH_AUDIENCE=inteli-dev
-      - AUTH_ISSUER=https://inteli.eu.auth0.com/
-      - AUTH_TOKEN_URL=https://inteli.eu.auth0.com/oauth/token
       - DB_HOST=postgres-identity-service
       - DB_PORT=5432
       - DB_NAME=dscp
@@ -50,7 +46,7 @@ services:
       - AUTH_TYPE=${AUTH_TYPE:-NONE}
 
   dscp-node:
-    image: ghcr.io/digicatapult/dscp-node:v3.8.0
+    image: digicatapult/dscp-node:latest
     container_name: node
     command:
       --base-path /data/
@@ -65,7 +61,7 @@ services:
     restart: on-failure
 
   ipfs:
-    image: ipfs/go-ipfs:v0.12.2
+    image: ipfs/go-ipfs:v0.13.1
     container_name: ipfs
     environment:
       - |
@@ -78,7 +74,7 @@ services:
       - 5001:5001
 
   dscp-api:
-    image: ghcr.io/digicatapult/dscp-api:v4.4.0
+    image: digicatapult/dscp-api:latest
     container_name: dscp-api
     ports:
       - 3001:3001
@@ -90,10 +86,6 @@ services:
       - IPFS_HOST=ipfs
       - IPFS_PORT=5001
       - LOG_LEVEL=trace
-      - AUTH_JWKS_URI=https://inteli.eu.auth0.com/.well-known/jwks.json
-      - AUTH_AUDIENCE=inteli-dev
-      - AUTH_ISSUER=https://inteli.eu.auth0.com/
-      - AUTH_TOKEN_URL=https://inteli.eu.auth0.com/oauth/token
       - AUTH_TYPE=${AUTH_TYPE:-NONE}
     restart: on-failure
 volumes:

helm/inteli-api/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 name: inteli-api
-appVersion: '1.28.0'
+appVersion: '1.29.0'
 description: A Helm chart for inteli-api
-version: '1.28.0'
+version: '1.29.0'
 type: application
 maintainers:
   - name: digicatapult

helm/inteli-api/values.yaml

@@ -37,10 +37,10 @@ service:
   port: 80
 
 image:
-  repository: ghcr.io/digicatapult/inteli-api
+  repository: digicatapult/inteli-api
   pullPolicy: IfNotPresent
-  tag: 'v1.28.0'
-  pullSecrets: ['ghcr-digicatapult']
+  tag: 'v1.29.0'
+  pullSecrets: []
 
 postgresql:
   enabled: true

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digicatapult/inteli-api",
-  "version": "1.28.0",
+  "version": "1.29.0",
   "description": "Insert repo description",
   "main": "app/index.js",
   "scripts": {