Dockerfile change

* changes for subspace (via nimbleape)

* changes from more testing

* working api to subspace

* more subspace fixes

* further subspace fixes

.github/workflows/docker-publish-dbcreate.yml

@@ -0,0 +1,51 @@
+name: Docker
+
+on:
+  push:
+    # Publish `main` as Docker `latest` image.
+    branches:
+      - main
+
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+
+env:
+  IMAGE_NAME: db-create
+
+jobs:
+  push:
+
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Build image
+        run: docker build . --file Dockerfile.db-create --tag $IMAGE_NAME
+
+      - name: Log into registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Push image
+        run: |
+          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
+
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          # Strip "v" prefix from tag name
+          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "main" ] && VERSION=latest
+
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
+
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION

.github/workflows/docker-publish.yml

@@ -0,0 +1,51 @@
+name: Docker
+
+on:
+  push:
+    # Publish `main` as Docker `latest` image.
+    branches:
+      - main
+
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+
+env:
+  IMAGE_NAME: api-server
+
+jobs:
+  push:
+
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Build image
+        run: docker build . --file Dockerfile --tag $IMAGE_NAME
+
+      - name: Log into registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Push image
+        run: |
+          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
+
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          # Strip "v" prefix from tag name
+          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "main" ] && VERSION=latest
+
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
+
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:17
 WORKDIR /opt/app/
 COPY package.json ./
 RUN npm install

Dockerfile.db-create

@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:17
 WORKDIR /opt/app/
 COPY package.json ./
 RUN npm install

lib/routes/api/accounts.js

@@ -385,7 +385,7 @@ router.post('/:sid/SubspaceTeleport', async(req, res) => {
     const teleport = await enableSubspace({
       subspace_client_id,
       subspace_client_secret,
-      destination: `sip:${dest}`
+      destination: dest
     });
     logger.info({destination, teleport}, 'SubspaceTeleport - create teleport');
     await Account.update(req.params.sid, {

lib/routes/api/utils.js

@@ -247,8 +247,9 @@ const enableSubspace = async(opts) => {
 
   const teleport = await postTeleport('/v1/sipteleport',
     {
+      name: 'Jambonz',
       destination,
-      name: 'Jambonz'
+      status: 'ENABLED'
     },
     {
       'Content-Type': 'application/json',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jambonz-api-server",
-  "version": "v0.6.7-rc8",
+  "version": "v0.7.1",
   "description": "",
   "main": "app.js",
   "scripts": {

test/docker-compose-testbed.yaml

@@ -10,6 +10,7 @@ networks:
 
 services:  
   mysql:
+    platform: linux/x86_64
     image: mysql:5.7
     ports:
       - "3360:3306"
@@ -35,6 +36,7 @@ services:
         ipv4_address: 172.58.0.3
     
   influxdb:
+    platform: linux/x86_64
     image: influxdb:1.8-alpine
     ports:
       - "8086:8086"