Skip to content

Conversation

Meo597
Copy link
Contributor

@Meo597 Meo597 commented Jun 7, 2025

解决/usr/local/share/xray目录缺少x权限,导致geodata无法加载的问题

@Meo597
Copy link
Contributor Author

Meo597 commented Jun 7, 2025

当时没详尽地完整测试

很抱歉背刺了R主席!

需要你手工删除ghcr.io中刚发布的latest25.6.7
github.com/XTLS/Xray-core/pkgs/container/xray-core/versions

@RPRX
Copy link
Member

RPRX commented Jun 7, 2025

只是 docker 镜像的问题的话还好,所以可以手动触发发布新版镜像吗

@Meo597
Copy link
Contributor Author

Meo597 commented Jun 7, 2025

手动的话要临时修改workflow,稍等下我试试

@Meo597
Copy link
Contributor Author

Meo597 commented Jun 7, 2025

可以临时用这个docker.yml单独发docker的版

写死的标签
已测

name: Build docker image

on:
  workflow_dispatch:
  push:

  release:
    types: [published]

jobs:
  build-image:
    runs-on: ubuntu-latest
    permissions:
      packages: write
    steps:
      - uses: actions/checkout@v4

      - name: Docker metadata
        id: meta
        uses: docker/metadata-action@v5
        with:
          images: ghcr.io/${{ github.repository_owner }}/xray-core
          tags: |
            type=raw,value=latest
            type=raw,value=25.6.7

      - name: Docker metadata (unsupported architectures)
        id: metausa
        uses: docker/metadata-action@v5
        with:
          images: ghcr.io/${{ github.repository_owner }}/xray-core
          tags: |
            type=raw,value=latest-usa
            type=raw,value=25.6.7-usa

      - name: Login to GitHub Container Registry
        uses: docker/login-action@v3
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3

      - name: Build and push
        uses: docker/build-push-action@v6
        with:
          context: .
          platforms: |
            linux/amd64
            linux/arm/v7
            linux/arm64/v8
            linux/ppc64le
            linux/s390x
          provenance: false
          file: .github/docker/Dockerfile
          push: true
          tags: ${{ steps.meta.outputs.tags }}

      - name: Build and push (unsupported architectures)
        uses: docker/build-push-action@v6
        with:
          context: .
          platforms: |
            linux/386
            linux/arm/v6
            linux/riscv64
            linux/loong64
          provenance: false
          file: .github/docker/Dockerfile.usa
          push: true
          tags: ${{ steps.metausa.outputs.tags }}

      - name: Merge Multi-Arch Manifests
        run: |
          echo "Starting to merge multi-architecture manifests..."

          # Convert newlines to spaces and split into array
          TAGS=($(echo "${{ steps.meta.outputs.tags }}" | tr '\n' ' '))

          echo "Total tags to process: ${#TAGS[@]}"
          for tag in "${TAGS[@]}"; do
            echo "Merging tag: $tag with unsupported architectures ($tag-usa)"
            docker buildx imagetools create --append --tag "$tag" "$tag-usa"
            if [ $? -ne 0 ]; then
              echo "Error: Failed to merge $tag-usa into $tag"
              exit 1
            fi
          done

          echo "Multi-architecture manifest merge completed successfully."

@RPRX
Copy link
Member

RPRX commented Jun 8, 2025

我决定还是今天发个新版吧,顺便把你那个 REALITY 回落限速给合了

@RPRX RPRX merged commit 7d36cad into XTLS:main Jun 8, 2025
39 checks passed
@Meo597 Meo597 deleted the fix-docker branch June 8, 2025 14:24
patterniha pushed a commit to patterniha/Xray-core that referenced this pull request Jun 11, 2025
patterniha pushed a commit to patterniha/Xray-core that referenced this pull request Jun 11, 2025
patterniha pushed a commit to patterniha/Xray-core that referenced this pull request Jun 12, 2025
patterniha pushed a commit to patterniha/Xray-core that referenced this pull request Jun 28, 2025
maoxikun pushed a commit to maoxikun/Xray-core that referenced this pull request Aug 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants