Fix release workflow

.github/workflows/build-and-push-services.yml

@@ -297,26 +297,6 @@ jobs:
         with:
           yq-version: v4.5.1
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1.3.0
-        with:
-          version: latest
-
-      - name: Cache docker layers
-        if: ${{ !env.ACT }} # Awaiting ACT version after 0.2.17 for this feature
-        uses: actions/cache@v2.1.5
-        id: cache
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}-${{ matrix.service }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-${{ github.sha }}-
-            ${{ runner.os }}-buildx-
-
       - name: Login to DockerHub
         uses: docker/login-action@v1.9.0
         with:
@@ -336,7 +316,7 @@ jobs:
           RELEASE=docker-compose.release.yml
 
           # Use commit of release as version??
-          OADA_VERSION="sha-${GITHUB_SHA::8}" \
+          OADA_VERSION="sha-${GITHUB_SHA::7}" \
             RELEASE_VERSION="${{ needs.setup.outputs.version }}" \
             ./release/make.sh | tee $RELEASE