Browse Source

fix some error

pull/221/head
zamibd 11 months ago
parent
commit
f1f5589804
  1. 98
      .github/workflows/publish-docker.yml
  2. 2
      Dockerfile

98
.github/workflows/publish-docker.yml

@ -1,72 +1,40 @@
name: Publish Docker Images name: Build and Push Docker Image
on: on:
push: push:
tags: [ 'v*.*.*' ] branches:
- main # Runs when code is pushed to the main branch
# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds. workflow_dispatch: # Allows manual trigger from GitHub UI
env:
REGISTRY: ghcr.io
# This also contains the owner, i.e. tun2proxy/tun2proxy.
IMAGE_PATH: ${{ github.repository }}
IMAGE_NAME: ${{ github.event.repository.name }}
DEFAULT_OS: scratch
# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
jobs: jobs:
build-and-push-image: build:
name: Build and push Docker image runs-on: ubuntu-latest # Uses the latest Ubuntu runner
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os: [ 'scratch', 'ubuntu', 'alpine' ]
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
permissions:
contents: read
packages: write
#
steps: steps:
- name: Checkout repository # ✅ Step 1: Checkout the repository code
- name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
# Add support for more platforms with QEMU (optional) # ✅ Step 2: Login to Docker Hub using secrets
# https://github.com/docker/setup-qemu-action - name: Login to Docker Hub
- name: Set up QEMU run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
uses: docker/setup-qemu-action@v3
# ✅ Step 3: Login to GitHub Container Registry (GHCR) using Personal Access Token
- name: Set up Docker Buildx # Required for pushing to organization-owned namespace (zamibd)
uses: docker/setup-buildx-action@v3 - name: Login to GHCR
run: echo "${{ secrets.GHCR_PAT }}" | docker login ghcr.io -u "${{ github.actor }}" --password-stdin
# Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
- name: Log in to the Container registry # ✅ Step 4: Build Docker image and tag for both Docker Hub and GHCR
uses: docker/login-action@v3 - name: Build Docker image
with: run: |
registry: ${{ env.REGISTRY }} docker build . --file Dockerfile \
username: ${{ github.actor }} --tag imzami/socks5:latest \
password: ${{ secrets.GITHUB_TOKEN }} --tag ghcr.io/zamibd/socks5:latest
# This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels. # ✅ Step 5: Push image to Docker Hub
- name: Extract metadata (tags, labels) for Docker Image - name: Push to Docker Hub
id: meta run: docker push imzami/socks5:latest
uses: docker/metadata-action@v5
with: # ✅ Step 6: Push image to GitHub Container Registry (GHCR)
# We publish the images with an OS-suffix. - name: Push to GHCR
# The image based on a default OS is also published without a suffix. run: docker push ghcr.io/zamibd/socks5:latest
images: |
${{ env.REGISTRY }}/${{ env.IMAGE_PATH }}-${{ matrix.os }}
${{ env.DEFAULT_OS == matrix.os && format('{0}/{1}', env.REGISTRY, env.IMAGE_PATH) || '' }}
# This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
# It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
# It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
- name: Build and push Docker image
uses: docker/build-push-action@v6
with:
platforms: linux/amd64,linux/arm64
context: .
file: Dockerfile
target: ${{ env.IMAGE_NAME }}-${{ matrix.os }}
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

2
Dockerfile

@ -34,7 +34,7 @@ FROM rust:latest AS musl-builder
#################################################################################################### ####################################################################################################
## Alpine image ## Alpine image
#################################################################################################### ####################################################################################################
FROM alpine:latest AS tun2proxy-alpine FROM alpine:3.22 AS tun2proxy-alpine
COPY --from=musl-builder /worker/target/*/release/tun2proxy-bin /usr/bin/tun2proxy-bin COPY --from=musl-builder /worker/target/*/release/tun2proxy-bin /usr/bin/tun2proxy-bin

Loading…
Cancel
Save