From 1f764bd71b9c342789dcaa3ec5283ea44cdb4c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= <monkeyblacktech97@gmail.com>
Date: Fri, 29 Jan 2021 01:00:54 -0500
Subject: [PATCH] dump version to 2.6.0

---
 .github/workflows/build-image.yml | 43 ++++++++++++++++++++++++-------
 config/version.php                |  2 +-
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 11165c6d..8e358968 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -1,28 +1,53 @@
-name: Docker Build And Push To Docker Hub
+name: ProxyPanel Docker
 
 on:
   push:
     branches:
-#      - master
+    #      - master
     tags:
       - V*
 
 jobs:
   build:
-    name: Build Proxy Panel
+    name: Build ProxyPanel Docker Image
     runs-on: ubuntu-18.04
     steps:
       - name: Git Checkout Code
         uses: actions/checkout@v1
         id: git_checkout
 
-      - name: Build and push Docker images
-        uses: docker/build-push-action@v1
+      - name: Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE=${{ secrets.DOCKER_REPO }}
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+          VERSION=${GITHUB_REF#refs/tags/}
+          elif [[ $GITHUB_REF == refs/heads/* ]]; then
+          VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
+          elif [[ $GITHUB_REF == refs/pull/* ]]; then
+          VERSION=pr-${{ github.event.number }}
+          fi
+
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
-          push: true
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: ${{ secrets.DOCKER_REPO }}
-          tag_with_ref: true
-          tag_with_sha: true
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
           tags: latest
+          labels: |
+            org.opencontainers.image.source=${{ github.event.repository.html_url }}
+            org.opencontainers.image.created=${{ steps.prep.outputs.created }}
+            org.opencontainers.image.revision=${{ github.sha }}
diff --git a/config/version.php b/config/version.php
index 556deccc..be40f26a 100644
--- a/config/version.php
+++ b/config/version.php
@@ -2,5 +2,5 @@
 
 return [
     'name' => 'ProxyPanel',
-    'number' => '2.6.d',
+    'number' => '2.6.0',
 ];