fixing cicd

Author: ebauman

.github/workflows/main.yaml

@@ -3,8 +3,6 @@ on: [push, pull_request]
 
 env:
   app_image: hobbyfarm/admin-ui
-  sdk_image: hobbyfarm/admin-ui-sdk
-  dockerfile: cicd/docker/Dockerfile
 
   should_push_image: |-
     ${{
@@ -29,14 +27,21 @@ jobs:
     - name: Checkout
       uses: actions/checkout@master
 
+    - name: Setup npm cache
+      uses: actions/setup-node@v3
+      with:
+        node-version: 16
+        cache: 'npm'
+
+    - name: Install deps
+      run: npm install
+
     - name: Build
-      run: |
-        docker build -f $dockerfile --tag $sdk_image --target sdk .
+      run: npm run build:prod
 
-    - name: Build Release
-      if: fromJSON(env.should_push_image)
+    - name: Build
       run: |
-        docker build -f $dockerfile --tag $app_image .
+        docker build -f cicd/Dockerfile -t $app_image:${GIT_COMMIT_SHORT_HASH:-dev}
 
     - name: Docker Login
       if: fromJSON(env.should_push_image)
@@ -50,9 +55,9 @@ jobs:
         safe_ref=$(echo "${{ github.ref_name }}" | sed -e 's/[^a-zA-Z0-9\-\.]/-/g')
         publish_tag=$app_image:$safe_ref
         
-        docker tag $app_image $publish_tag
+        docker tag $app_image:${GIT_COMMIT_SHORT_HASH:-dev} $publish_tag
         docker push $publish_tag
 
     - name: Docker Push Latest
       if: fromJSON(env.should_tag_latest)
-      run: docker push $app_image
+      run: docker push $app_image:latest

cicd/docker/Dockerfile renamed to Dockerfile

@@ -0,0 +1,11 @@
+# Should only be used with GitHub Actions cicd
+# For local, refer to Dockerfile at root of project
+
+FROM nginx:stable-alpine
+
+COPY dist/* /usr/share/nginx/html
+
+# copy staged files
+COPY cicd/docker/stage-release/ /
+
+ENTRYPOINT ["entrypoint.sh"]