mirror of https://github.com/stilleshan/frps.git
Update v0.39.0
This commit is contained in:
parent
8b122d3347
commit
dee8e0d071
|
@ -1,49 +0,0 @@
|
||||||
name: "build for docker"
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
paths:
|
|
||||||
- 'Dockerfile'
|
|
||||||
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
env:
|
|
||||||
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
- name: Set tag
|
|
||||||
id: tag
|
|
||||||
run: |
|
|
||||||
TAG=$(cat Dockerfile | awk 'NR==4 {print $3}')
|
|
||||||
echo "::set-env name=TAG::$TAG"
|
|
||||||
- name: Docker Hub login
|
|
||||||
env:
|
|
||||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
|
||||||
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
|
||||||
run: |
|
|
||||||
echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
id: buildx
|
|
||||||
uses: crazy-max/ghaction-docker-buildx@v1
|
|
||||||
with:
|
|
||||||
buildx-version: latest
|
|
||||||
- name: Build Dockerfile
|
|
||||||
env:
|
|
||||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
|
||||||
run: |
|
|
||||||
docker buildx build \
|
|
||||||
--platform=linux/amd64,linux/arm64 \
|
|
||||||
--output "type=image,push=true" \
|
|
||||||
--file ./Dockerfile . \
|
|
||||||
--tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/${{ github.event.repository.name }}:latest \
|
|
||||||
--tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/${{ github.event.repository.name }}:${TAG}
|
|
||||||
- name: Sync README.md
|
|
||||||
uses: ms-jpq/sync-dockerhub-readme@v1
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
|
||||||
repository: ${{ secrets.DOCKER_USERNAME }}/${{ github.event.repository.name }}
|
|
||||||
readme: "README.md"
|
|
|
@ -0,0 +1,72 @@
|
||||||
|
name: "docker build release"
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
env:
|
||||||
|
PROJECT: frps
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v2.3.5
|
||||||
|
|
||||||
|
- name: Set tag
|
||||||
|
id: tag
|
||||||
|
run: |
|
||||||
|
if [[ -n $(cat Dockerfile | awk '{if($1~"ENV" && $2=="VERSION")print $3}') ]]; then
|
||||||
|
VERSION=$(cat Dockerfile | awk '{if($1~"ENV" && $2=="VERSION")print $3}')
|
||||||
|
echo "tag=$VERSION" >> $GITHUB_ENV
|
||||||
|
else
|
||||||
|
echo "tag=$(date +%Y)-$(date +%m)-$(date +%d)" >> $GITHUB_ENV
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v1
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v1
|
||||||
|
|
||||||
|
- name: Login Docker Hub
|
||||||
|
uses: docker/login-action@v1
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
|
- name: Build and push to docker hub
|
||||||
|
uses: docker/build-push-action@v2
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
${{ secrets.DOCKER_USERNAME }}/${{ env.PROJECT }}:latest
|
||||||
|
${{ secrets.DOCKER_USERNAME }}/${{ env.PROJECT }}:${{ env.tag }}
|
||||||
|
|
||||||
|
- name: Sync README.md to Docker Hub
|
||||||
|
uses: ms-jpq/sync-dockerhub-readme@v1
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
repository: ${{ secrets.DOCKER_USERNAME }}/${{ env.PROJECT }}
|
||||||
|
readme: "./README.md"
|
||||||
|
|
||||||
|
- name: Login harbor
|
||||||
|
uses: docker/login-action@v1
|
||||||
|
with:
|
||||||
|
registry: ${{ secrets.HARBOR_REGISTRY }}
|
||||||
|
username: ${{ secrets.HARBOR_USERNAME }}
|
||||||
|
password: ${{ secrets.HARBOR_PASSWORD }}
|
||||||
|
|
||||||
|
- name: Build and push to harbor
|
||||||
|
uses: docker/build-push-action@v2
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
${{ secrets.HARBOR_REGISTRY }}/${{ secrets.HARBOR_USERNAME }}/${{ env.PROJECT }}:latest
|
||||||
|
${{ secrets.HARBOR_REGISTRY }}/${{ secrets.HARBOR_USERNAME }}/${{ env.PROJECT }}:${{ env.tag }}
|
30
Dockerfile
30
Dockerfile
|
@ -1,24 +1,22 @@
|
||||||
FROM alpine:3.8
|
FROM alpine:3.8
|
||||||
MAINTAINER Stille <stille@ioiox.com>
|
LABEL maintainer="Stille <stille@ioiox.com>"
|
||||||
|
|
||||||
ENV FRP_VERSION 0.38.0
|
ENV VERSION 0.39.0
|
||||||
|
ENV TZ=Asia/Shanghai
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
|
|
||||||
RUN set -xe && \
|
RUN apk add --no-cache tzdata \
|
||||||
apk add tzdata && \
|
&& ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \
|
||||||
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
|
&& echo ${TZ} > /etc/timezone
|
||||||
echo "Asia/Shanghai" > /etc/timezone && \
|
|
||||||
apk del tzdata
|
|
||||||
|
|
||||||
RUN set -x && \
|
RUN if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM=amd64 ; else if [ "$(uname -m)" = "aarch64" ]; then export PLATFORM=arm64 ; fi fi \
|
||||||
if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM=amd64 ; else if [ "$(uname -m)" = "aarch64" ]; then export PLATFORM=arm64 ; fi fi && \
|
&& wget --no-check-certificate https://github.com/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_linux_${PLATFORM}.tar.gz \
|
||||||
wget --no-check-certificate https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/frp_${FRP_VERSION}_linux_${PLATFORM}.tar.gz && \
|
&& tar xzf frp_${VERSION}_linux_${PLATFORM}.tar.gz \
|
||||||
tar xzf frp_${FRP_VERSION}_linux_${PLATFORM}.tar.gz && \
|
&& cd frp_${VERSION}_linux_${PLATFORM} \
|
||||||
cd frp_${FRP_VERSION}_linux_${PLATFORM} && \
|
&& mkdir /frp \
|
||||||
mkdir /frp && \
|
&& mv frps frps.ini /frp \
|
||||||
mv frps frps.ini /frp && \
|
&& cd .. \
|
||||||
cd .. && \
|
&& rm -rf *.tar.gz frp_${VERSION}_linux_${PLATFORM}
|
||||||
rm -rf *.tar.gz frp_${FRP_VERSION}_linux_${PLATFORM}
|
|
||||||
|
|
||||||
VOLUME /frp
|
VOLUME /frp
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ Font="\033[0m"
|
||||||
# fonts color
|
# fonts color
|
||||||
|
|
||||||
# variable
|
# variable
|
||||||
FRP_VERSION=0.38.0
|
FRP_VERSION=0.39.0
|
||||||
REPO=stilleshan/frps
|
REPO=stilleshan/frps
|
||||||
WORK_PATH=$(dirname $(readlink -f $0))
|
WORK_PATH=$(dirname $(readlink -f $0))
|
||||||
FRP_NAME=frps
|
FRP_NAME=frps
|
||||||
|
|
|
@ -14,7 +14,7 @@ Font="\033[0m"
|
||||||
# variable
|
# variable
|
||||||
WORK_PATH=$(dirname $(readlink -f $0))
|
WORK_PATH=$(dirname $(readlink -f $0))
|
||||||
FRP_NAME=frps
|
FRP_NAME=frps
|
||||||
FRP_VERSION=0.38.0
|
FRP_VERSION=0.39.0
|
||||||
FRP_PATH=/usr/local/frp
|
FRP_PATH=/usr/local/frp
|
||||||
|
|
||||||
# 停止frpc
|
# 停止frpc
|
||||||
|
|
Loading…
Reference in New Issue