Skip to content

Commit

Permalink
refactor: remove vcards-pro workflow and update Dockerfile references…
Browse files Browse the repository at this point in the history
… to funnyzak/vCards
  • Loading branch information
funnyzak committed Dec 24, 2024
1 parent e70bb13 commit 0dea138
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 110 deletions.
15 changes: 1 addition & 14 deletions .github/workflows/dispatch-choice.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ on:
- git-sync
- cron
- vcards
- vcards-pro
- certimate
- mysql-dump
- dify2openai
Expand Down Expand Up @@ -77,19 +76,7 @@ jobs:
build_args: ${{ github.event.inputs.build_args }}
build_platforms: ${{ github.event.inputs.build_platforms || 'linux/amd64,linux/arm64' }}
secrets: inherit

vcards_pro_release:
if: ${{ github.event.inputs.choice_service == 'vcards-pro' }}
uses: ./.github/workflows/release.yml
with:
build_context: './Docker/vcards'
docker_image_name: vcards-pro
docker_file_name: 'Dockerfile.pro'
docker_tags: ${{ github.event.inputs.docker_tags }}
build_args: ${{ github.event.inputs.build_args }}
build_platforms: ${{ github.event.inputs.build_platforms || 'linux/amd64,linux/arm64' }}
secrets: inherit


env_mock_data_release:
if: ${{ github.event.inputs.choice_service == 'env-mock-data' }}
uses: ./.github/workflows/release.yml
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/schedule-watch-offical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,6 @@ jobs:
build_platforms: 'linux/amd64,linux/arm64'
secrets: inherit

watch_vcards_pro_release:
uses: ./.github/workflows/check-offical-release.yml
with:
build_context: './Docker/vcards'
image_name: vcards-pro
get_official_version_command: 'curl -s https://api.github.com/repos/funnyzak/vCards/tags | jq -r ".[0].name // \"no-tags\""'
is_latest_tag: true
build_platforms: 'linux/amd64,linux/arm64'
secrets: inherit

watch_certimate_release:
uses: ./.github/workflows/check-offical-release.yml
with:
Expand Down
9 changes: 5 additions & 4 deletions Docker/vcards/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM node:20-alpine3.19 AS builder

ARG VERSION

WORKDIR /app

RUN apk add --no-cache git

ARG VERSION

WORKDIR /app

RUN git clone https://github.com/metowolf/vCards . \
RUN git clone https://github.com/funnyzak/vCards . \
&& git checkout ${VERSION} || git checkout $(git remote show origin | awk '/HEAD branch/ {print $NF}') \
&& echo ${VERSION:-$(git rev-parse HEAD)} > VERSION

Expand Down Expand Up @@ -68,7 +68,8 @@ RUN apk add --no-cache \

ENV TZ=Asia/Shanghai
ENV DOWNLOAD_DIR="/app/downloads"
ENV REPO_NAME="metowolf/vCards"
ENV REPO_NAME="funnyzak/vCards"
ENV SYNC_ON_STARTUP="true"

COPY --from=builder /app/radicale/ /app/vcards/collection-root/cn/
COPY --from=builder /app/VERSION /app/VERSION
Expand Down
82 changes: 0 additions & 82 deletions Docker/vcards/Dockerfile.pro

This file was deleted.

0 comments on commit 0dea138

Please sign in to comment.