From d3206607285ddbadfaca19dba3254fa23b5d75ce Mon Sep 17 00:00:00 2001
From: Sean Macfarlane <sean.g.macfarlane@gmail.com>
Date: Thu, 16 Apr 2020 19:42:40 -0400
Subject: [PATCH] update docker

---
 .github/workflows/dockerpublish.yml | 20 +-------------------
 Dockerfile                          |  2 +-
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/dockerpublish.yml b/.github/workflows/dockerpublish.yml
index e9a3034..9b1c6c0 100644
--- a/.github/workflows/dockerpublish.yml
+++ b/.github/workflows/dockerpublish.yml
@@ -17,25 +17,7 @@ env:
   IMAGE_NAME: wlan-cloud-ui
 
 jobs:
-  # Run tests.
-  # See also https://docs.docker.com/docker-hub/builds/automated-testing/
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Run tests
-        run: |
-          if [ -f docker-compose.test.yml ]; then
-            docker-compose --file docker-compose.test.yml build
-            docker-compose --file docker-compose.test.yml run sut
-          else
-            docker build --build-arg NPM_TOKEN=${{secrets.NPM_REPO_AUTH_TOKEN}} .
-          fi
   push:
-    # Ensure test job passes before pushing image.
-    needs: test
 
     runs-on: ubuntu-latest
     if: github.event_name == 'push'
@@ -51,7 +33,7 @@ jobs:
           password: ${{ secrets.REPO_PASSWORD }}
 
       - name: Build image
-        run: docker build --build-arg  NPM_TOKEN=${{secrets.NPM_REPO_AUTH_TOKEN}} . --tag image
+        run: docker build --build-arg NPM_TOKEN=${{secrets.NPM_REPO_AUTH_TOKEN}} . --tag image
 
       - name: Push image
         run: |
diff --git a/Dockerfile b/Dockerfile
index 4c81bbd..dfc3eb2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ COPY package*.json ./
 
 #RUN npm install
 # If you are building your code for production
-RUN (echo "@tip-wlan:registry=https://tip.jfrog.io/artifactory/api/npm/tip-wlan-cloud-npm-repo/" && echo "//tip.jfrog.io/artifactory/api/npm/tip-wlan-cloud-npm-repo/:_authToken=$NPM_TOKEN" && echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN") > .npmrc
+RUN (echo "@tip-wlan:registry=https://tip.jfrog.io/artifactory/api/npm/tip-wlan-cloud-npm-repo/" && echo "//tip.jfrog.io/artifactory/api/npm/tip-wlan-cloud-npm-repo/:_authToken=$NPM_TOKEN") > .npmrc
 RUN npm ci --only=production
 RUN rm -f .npmrc