develop #3

Merged
jack merged 3 commits from develop into main 2024-09-16 16:01:29 +00:00
2 changed files with 22 additions and 15 deletions

View File

@@ -57,16 +57,22 @@ jobs:
push: true
tags: ${{ steps.set_tags.outputs.image_tags }}
# - name: Set Portainer Webhook URL
# run: |
# if [[ "${{ gitea.ref_name }}" == "main" ]]; then
# echo "PORTAINER_WEBHOOK_URL=${{ secrets.PORTAINER_WEBHOOK_URL_MAIN }}" >> $GITHUB_ENV
# elif [[ "${{ gitea.ref_name }}" == "develop" ]]; then
# echo "PORTAINER_WEBHOOK_URL=${{ secrets.PORTAINER_WEBHOOK_URL_DEV }}" >> $GITHUB_ENV
# fi
- name: Set Portainer Webhook URL
run: |
if [[ "${{ gitea.ref_name }}" == "main" ]]; then
if [[ -n "${{ secrets.PORTAINER_WEBHOOK_URL_MAIN }}" ]]; then
echo "PORTAINER_WEBHOOK_URL=${{ secrets.PORTAINER_WEBHOOK_URL_MAIN }}" >> $GITHUB_ENV
fi
elif [[ "${{ gitea.ref_name }}" == "develop" ]]; then
if [[ -n "${{ secrets.PORTAINER_WEBHOOK_URL_DEV }}" ]]; then
echo "PORTAINER_WEBHOOK_URL=${{ secrets.PORTAINER_WEBHOOK_URL_DEV }}" >> $GITHUB_ENV
fi
fi
# - name: Trigger Portainer Webhook
# run: |
# curl -X POST --silent --fail "$PORTAINER_WEBHOOK_URL"
# env:
# PORTAINER_WEBHOOK_URL: ${{ env.PORTAINER_WEBHOOK_URL }}
- name: Trigger Portainer Webhook
run: |
if [[ -n "${{ env.PORTAINER_WEBHOOK_URL }}" ]]; then
curl -X POST --silent --fail "$PORTAINER_WEBHOOK_URL"
fi
env:
PORTAINER_WEBHOOK_URL: ${{ env.PORTAINER_WEBHOOK_URL }}

View File

@@ -27,12 +27,13 @@ RUN npm run build
################################################
FROM node:lts-alpine
COPY --from=build /app/package*.json ./
COPY --from=build /app/dist ./dist
# Install dependencies but skip dev dependencies
COPY --from=build /app/package*.json ./
RUN npm install --only=production
# Copy the app
COPY --from=build /app/dist ./dist
# Start the app
ENTRYPOINT ["npm", "run"]
CMD ["start"]