From cbca721eaac5b2995ca20aea3578f469238611e4 Mon Sep 17 00:00:00 2001
From: Edwin Betancourt <EdwinBetanc0urt@outlook.com>
Date: Thu, 5 Aug 2021 21:50:48 -0400
Subject: [PATCH] fix: Docker image files. (#1019)

---
 .github/workflows/publish.yml | 14 +++++++-------
 build/Dockerfile.prod         |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8528e215..4e027fd6 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -98,13 +98,9 @@ jobs:
         run: |
           echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV}
           echo "REPO_LC=${NAME,,}" >> ${GITHUB_ENV}
-          echo "OWNER_REPO_LC=${REPO,,}" >> ${GITHUB_ENV}
         env:
           OWNER: '${{ github.repository_owner }}'
           NAME: '${{ github.event.repository.name }}'
-          REPO: '${{ github.repository }}'
-
-      - run: echo ${{ env }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
@@ -147,16 +143,20 @@ jobs:
 
       - name: Set Lower Case to owner and repository
         run: |
+          ORG=$OWNER
+          if [ -n "${{ secrets.DOCKERHUB_ORG }}" ]; then
+            echo "Set secret DOCKERHUB_ORG as namespace"
+            ORG=${{ secrets.DOCKERHUB_ORG }}
+          else
+            echo "Set OWNER ($OWNER) as namespace "
+          fi
           echo "ORG_LC=${ORG,,}" >> ${GITHUB_ENV}
           echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV}
           echo "REPO_LC=${NAME,,}" >> ${GITHUB_ENV}
-          echo "OWNER_REPO_LC=${REPO,,}" >> ${GITHUB_ENV}
         env:
           # to docker image namespace
-          ORG: '${{ secrets.DOCKERHUB_ORG }}'
           OWNER: '${{ github.repository_owner }}'
           NAME: '${{ github.event.repository.name }}'
-          REPO: '${{ github.repository }}'
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
diff --git a/build/Dockerfile.prod b/build/Dockerfile.prod
index 2a5efcd9..81a5368c 100644
--- a/build/Dockerfile.prod
+++ b/build/Dockerfile.prod
@@ -9,7 +9,7 @@ ENV API_URL="https://api.erpya.com"
 
 
 COPY build/start.sh .
-COPY dist/* /usr/share/nginx/html/
+COPY dist/ /usr/share/nginx/html/
 
 
 CMD 'sh' 'start.sh'