hesoyam/psiphon-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor CI/CD workflow for Docker image handling

Browse Source
This commit is contained in:
Swarup Sengupta
2025-11-29 01:29:23 +05:30
committed by GitHub
parent a7f27f9da9
commit eef218eae5
1 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/cicd.yaml
+33 -31
View File
@@ -98,35 +98,20 @@ jobs:
echo "version=$VERSION" >> "$GITHUB_OUTPUT" echo "version=$VERSION" >> "$GITHUB_OUTPUT"
echo "go_version=$GO_VERSION" >> "$GITHUB_OUTPUT" echo "go_version=$GO_VERSION" >> "$GITHUB_OUTPUT"
- name: Build multi-arch image - name: Check Docker Hub if tag missing
id: build_img id: dockerhub_check
run: |
PSIPHON_VERSION=${{ steps.psiphon.outputs.version }}
GO_VERSION=${{ steps.psiphon.outputs.go_version }}
./make.bash -t all -v "$PSIPHON_VERSION" -g "$GO_VERSION"
- name: Push to Docker Hub if missing
id: dockerhub_push
if: steps.dryrun.outputs.dry_run != 'true'
run: | run: |
VERSION=${{ steps.psiphon.outputs.version }} VERSION=${{ steps.psiphon.outputs.version }}
DH_IMAGE=docker.io/swarupsengupta2007/psiphon DH_IMAGE=docker.io/swarupsengupta2007/psiphon
if docker manifest inspect ${DH_IMAGE}:${VERSION} >/dev/null 2>&1; then if docker manifest inspect ${DH_IMAGE}:${VERSION} >/dev/null 2>&1; then
echo "Docker Hub: ${VERSION} already exists, skipping." echo "Docker Hub: ${VERSION} already exists, skipping."
echo "pushed_dockerhub=false" >> "$GITHUB_OUTPUT" echo "dockerhub_tag=false" >> "$GITHUB_OUTPUT"
else else
docker tag psiphon:${VERSION} ${DH_IMAGE}:${VERSION} echo "dockerhub_tag=true" >> "$GITHUB_OUTPUT"
docker push ${DH_IMAGE}:${VERSION}
docker tag psiphon:${VERSION} ${DH_IMAGE}:latest
docker push ${DH_IMAGE}:latest
echo "pushed_dockerhub=true" >> "$GITHUB_OUTPUT"
fi fi
- name: Push to GHCR if missing - name: Check GHCR if tag missing
id: ghcr_push id: ghcr_check
if: steps.dryrun.outputs.dry_run != 'true'
run: | run: |
VERSION=${{ steps.psiphon.outputs.version }} VERSION=${{ steps.psiphon.outputs.version }}
OWNER=${{ github.repository_owner }} OWNER=${{ github.repository_owner }}
@@ -134,15 +119,32 @@ jobs:
if docker manifest inspect ${GH_IMAGE}:${VERSION} >/dev/null 2>&1; then if docker manifest inspect ${GH_IMAGE}:${VERSION} >/dev/null 2>&1; then
echo "GHCR: ${VERSION} already exists, skipping." echo "GHCR: ${VERSION} already exists, skipping."
echo "pushed_ghcr=false" >> "$GITHUB_OUTPUT" echo "ghcr_tag=false" >> "$GITHUB_OUTPUT"
else else
echo "GHCR: pushing ${VERSION} and latest" echo "ghcr_tag=true" >> "$GITHUB_OUTPUT"
docker tag psiphon:${VERSION} ${GH_IMAGE}:${VERSION}
docker push ${GH_IMAGE}:${VERSION}
docker tag psiphon:${VERSION} ${GH_IMAGE}:latest
docker push ${GH_IMAGE}:latest
echo "pushed_ghcr=true" >> "$GITHUB_OUTPUT"
fi fi
- name: Build and push multi-arch image
id: build_img
run: |
PSIPHON_VERSION=${{ steps.psiphon.outputs.version }}
GO_VERSION=${{ steps.psiphon.outputs.go_version }}
DOCKERHUB=${{ steps.dockerhub_check.outputs.dockerub_tab }}
GHCR=${{ steps.ghcr_check.outputs.ghcr_tab }}
DRY_RUN=${{ steps.dryrun.outputs.dry_run }}
ARGS=()
if [[ "$DRY_RUN" == "false" ]]; then
if [[ "$DOCKERHUB" == "false" ]]; then
ARGS+=(--nodockerhub)
fi
if [[ "$GHCR" == "false" ]]; then
ARGS+=(--noghcr)
fi
ARGS+=(--push)
else
echo "Not pushing anything as it's a dry run"
fi
./make.bash -t all -v "$PSIPHON_VERSION" -g "$GO_VERSION" "$ARGS[@]"