blackteay/vue-element-admin
1
0
Fork 0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-10 20:39:48 +08:00
Code Issues Releases Wiki Activity

fix: Docker image files. (#1019)

Browse Source
This commit is contained in:
Edwin Betancourt 2021-08-05 21:50:48 -04:00 committed by GitHub
parent fb3f2084f3
commit cbca721eaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/publish.yml vendored
View File

@ -98,13 +98,9 @@ jobs:
run: | run: |
echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV} echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV}
echo "REPO_LC=${NAME,,}" >> ${GITHUB_ENV} echo "REPO_LC=${NAME,,}" >> ${GITHUB_ENV}
echo "OWNER_REPO_LC=${REPO,,}" >> ${GITHUB_ENV}
env: env:
OWNER: '${{ github.repository_owner }}' OWNER: '${{ github.repository_owner }}'
NAME: '${{ github.event.repository.name }}' NAME: '${{ github.event.repository.name }}'
REPO: '${{ github.repository }}'
- run: echo ${{ env }}
- name: Build and push Docker image - name: Build and push Docker image
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
@ -147,16 +143,20 @@ jobs:
- name: Set Lower Case to owner and repository - name: Set Lower Case to owner and repository
run: | 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 "ORG_LC=${ORG,,}" >> ${GITHUB_ENV}
echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV} echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV}
echo "REPO_LC=${NAME,,}" >> ${GITHUB_ENV} echo "REPO_LC=${NAME,,}" >> ${GITHUB_ENV}
echo "OWNER_REPO_LC=${REPO,,}" >> ${GITHUB_ENV}
env: env:
# to docker image namespace # to docker image namespace
ORG: '${{ secrets.DOCKERHUB_ORG }}'
OWNER: '${{ github.repository_owner }}' OWNER: '${{ github.repository_owner }}'
NAME: '${{ github.event.repository.name }}' NAME: '${{ github.event.repository.name }}'
REPO: '${{ github.repository }}'
- name: Build and push Docker image - name: Build and push Docker image
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2

2
build/Dockerfile.prod
View File

@ -9,7 +9,7 @@ ENV API_URL="https://api.erpya.com"
COPY build/start.sh . COPY build/start.sh .
COPY dist/* /usr/share/nginx/html/ COPY dist/ /usr/share/nginx/html/
CMD 'sh' 'start.sh' CMD 'sh' 'start.sh'