From 41bb510516777f3a0a7fd19ca146d9d2dc81027f Mon Sep 17 00:00:00 2001
From: hzy <hzy@jsjyhzy.cc>
Date: Sun, 2 Dec 2018 13:05:43 +0800
Subject: [PATCH 1/7] export v0.21.0
---
.drone.yml | 4 +++-
Dockerfile | 3 +++
start_srv.sh | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/.drone.yml b/.drone.yml
index aee4633..3bdb7a6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,7 +3,9 @@ pipeline:
image: plugins/docker
repo: kitakami/frp-server
tags:
- - dev
+ - latest
+ - 0.21
+ - 0.21.0
username:
from_secret: docker_username
password:
diff --git a/Dockerfile b/Dockerfile
index 7eb18c3..ac2d296 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,12 @@
FROM golang:alpine as builder
+ENV TARGET_VERSION=v0.21.0
+
RUN export GOPATH=$HOME/go &&\
apk add git make &&\
git clone https://github.com/fatedier/frp.git $GOPATH/src/github.com/fatedier/frp &&\
cd $GOPATH/src/github.com/fatedier/frp &&\
+git checkout ${TARGET_VERSION} &&\
make frps &&\
mkdir /frp &&\
cp ./bin/frps /frp/
diff --git a/start_srv.sh b/start_srv.sh
index 0712e03..8f86185 100644
--- a/start_srv.sh
+++ b/start_srv.sh
@@ -26,6 +26,7 @@ if [ -f config/frps.ini ]
else
echo "Create default configure"
config config/frps.ini
+ echo "Version $(./frps -v)"
echo "Using username ${USERNAME}"
echo "Using password ${PASSWORD}"
echo "Using token ${TOKEN}"
--
GitLab
From f4f3f012cd52dabbf291637d259e085b840edc0f Mon Sep 17 00:00:00 2001
From: hzy <hzy@jsjyhzy.cc>
Date: Sun, 9 Dec 2018 23:06:28 +0800
Subject: [PATCH 2/7] bump 0.22.0
---
.drone.yml | 4 ++--
Dockerfile | 2 +-
start_srv.sh | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.drone.yml b/.drone.yml
index 3bdb7a6..45b065b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,8 +4,8 @@ pipeline:
repo: kitakami/frp-server
tags:
- latest
- - 0.21
- - 0.21.0
+ - 0.22
+ - 0.22.0
username:
from_secret: docker_username
password:
diff --git a/Dockerfile b/Dockerfile
index ac2d296..e2d1e55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
FROM golang:alpine as builder
-ENV TARGET_VERSION=v0.21.0
+ENV TARGET_VERSION=v0.22.0
RUN export GOPATH=$HOME/go &&\
apk add git make &&\
diff --git a/start_srv.sh b/start_srv.sh
index 8f86185..bb58ede 100644
--- a/start_srv.sh
+++ b/start_srv.sh
@@ -26,12 +26,13 @@ if [ -f config/frps.ini ]
else
echo "Create default configure"
config config/frps.ini
- echo "Version $(./frps -v)"
echo "Using username ${USERNAME}"
echo "Using password ${PASSWORD}"
echo "Using token ${TOKEN}"
fi
+echo "Version $(./frps -v)"
+
unset USERNAME
unset PASSWORD
unset TOKEN
--
GitLab
From 38166a3c392ba5f64b9ea7cd009d91879dae803b Mon Sep 17 00:00:00 2001
From: hzy <i@huzheyang.com>
Date: Wed, 5 Jun 2019 23:39:38 +0800
Subject: [PATCH 3/7] fix try 1
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ddeb650..161b627 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ variables:
before_script:
- docker info
- docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWD
- - export TARGET_VERSION=$(cat Dockerfile | grep -oe '^ENV TARGET_VERSION=v\K(.*)$')
+ - export TARGET_VERSION=$(grep -oe '^ENV TARGET_VERSION=v\K(.*)$' Dockerfile)
prebuild:
stage: prebuild
@@ -37,8 +37,8 @@ publish:
stage: publish
script:
- docker build -t $RELEASE_IMAGE .
- - docker push $RELEASE_IMAGE
- - docker tag $RELEASE_IMAGE ${RELEASE_IMAGE}:${TARGET_VERSION}
- - docker push ${RELEASE_IMAGE}:${TARGET_VERSION}
+ - docker push ${RELEASE_IMAGE}:latest
+ - docker tag $RELEASE_IMAGE ${RELEASE_IMAGE}:$(grep -oe '^ENV TARGET_VERSION=v\K(.*)$' Dockerfile)
+ - docker push ${RELEASE_IMAGE}:$(grep -oe '^ENV TARGET_VERSION=v\K(.*)$' Dockerfile)
only:
- master
\ No newline at end of file
--
GitLab
From 871b604f93a30a7ee2199b69717d9e4736d55cfa Mon Sep 17 00:00:00 2001
From: hzy <i@huzheyang.com>
Date: Wed, 5 Jun 2019 23:46:32 +0800
Subject: [PATCH 4/7] inital
---
.gitlab-ci.yml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 161b627..83274a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
image: docker:stable
stages:
+ - test
- prebuild
- build
- publish
@@ -16,6 +17,14 @@ before_script:
- docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWD
- export TARGET_VERSION=$(grep -oe '^ENV TARGET_VERSION=v\K(.*)$' Dockerfile)
+test:
+ stage: test
+ script:
+ - ls -a
+ - echo $(grep -oe '^ENV TARGET_VERSION=v\K(.*)$' Dockerfile)
+ - echo $(grep -oE '^ENV TARGET_VERSION=v\K(.*)$' Dockerfile)
+ - echo $(grep -oP '^ENV TARGET_VERSION=v\K(.*)$' Dockerfile)
+
prebuild:
stage: prebuild
script:
--
GitLab
From 81081615223bd2481260e193f7ae30af2b84c896 Mon Sep 17 00:00:00 2001
From: hzy <i@huzheyang.com>
Date: Thu, 6 Jun 2019 08:53:29 +0800
Subject: [PATCH 5/7] test1
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83274a0..e6a5305 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,9 +21,9 @@ test:
stage: test
script:
- ls -a
- - echo $(grep -oe '^ENV TARGET_VERSION=v\K(.*)$' Dockerfile)
- - echo $(grep -oE '^ENV TARGET_VERSION=v\K(.*)$' Dockerfile)
- - echo $(grep -oP '^ENV TARGET_VERSION=v\K(.*)$' Dockerfile)
+ - echo $(grep -oe '(?<=ENV TARGET_VERSION=v).*?$' Dockerfile)
+ - echo $(grep -oE '(?<=ENV TARGET_VERSION=v).*?$' Dockerfile)
+ - echo $(cat Dockerfile | grep -oe '(?<=ENV TARGET_VERSION=v).*?$')
prebuild:
stage: prebuild
--
GitLab
From 7678c3b95699b8b915e288b16f1ae20d78523ca6 Mon Sep 17 00:00:00 2001
From: hzy <i@huzheyang.com>
Date: Thu, 6 Jun 2019 09:09:22 +0800
Subject: [PATCH 6/7] dockerfile use arg
---
.gitlab-ci.yml | 7 ++-----
Dockerfile | 3 ++-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6a5305..c50766f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,7 @@ stages:
- publish
variables:
+ TARGET_VERSION: v0.22.0
REPO_NAME: frp-server
PREBUILD_IMAGE: kitakami/$REPO_NAME:nightly
TEST_IMAGE: kitakami/$REPO_NAME:dev-$CI_PIPELINE_ID
@@ -15,15 +16,11 @@ variables:
before_script:
- docker info
- docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWD
- - export TARGET_VERSION=$(grep -oe '^ENV TARGET_VERSION=v\K(.*)$' Dockerfile)
test:
stage: test
script:
- - ls -a
- - echo $(grep -oe '(?<=ENV TARGET_VERSION=v).*?$' Dockerfile)
- - echo $(grep -oE '(?<=ENV TARGET_VERSION=v).*?$' Dockerfile)
- - echo $(cat Dockerfile | grep -oe '(?<=ENV TARGET_VERSION=v).*?$')
+ - docker build -t ${RELEASE_IMAGE}:${TARGET_VERSION} .
prebuild:
stage: prebuild
diff --git a/Dockerfile b/Dockerfile
index e2d1e55..86c4143 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
FROM golang:alpine as builder
-ENV TARGET_VERSION=v0.22.0
+ARG TARGET_VERSION
+ENV TARGET_VERSION=$TARGET_VERSION
RUN export GOPATH=$HOME/go &&\
apk add git make &&\
--
GitLab
From 722064d66709aa42dbb9ecd8d7a0df60447328d6 Mon Sep 17 00:00:00 2001
From: hzy <i@huzheyang.com>
Date: Thu, 6 Jun 2019 09:18:07 +0800
Subject: [PATCH 7/7] test 2
---
.gitlab-ci.yml | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c50766f..829366e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,13 @@
image: docker:stable
stages:
- - test
- prebuild
- build
- publish
variables:
- TARGET_VERSION: v0.22.0
+ TARGET_VERSION_NUM: 0.22.0
+ TARGET_VERSION: v${TARGET_VERSION_NUM}
REPO_NAME: frp-server
PREBUILD_IMAGE: kitakami/$REPO_NAME:nightly
TEST_IMAGE: kitakami/$REPO_NAME:dev-$CI_PIPELINE_ID
@@ -17,15 +17,10 @@ before_script:
- docker info
- docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWD
-test:
- stage: test
- script:
- - docker build -t ${RELEASE_IMAGE}:${TARGET_VERSION} .
-
prebuild:
stage: prebuild
script:
- - docker build -t $PREBUILD_IMAGE .
+ - docker build -t $PREBUILD_IMAGE --build-arg TARGET_VERSION=${TARGET_VERSION} .
except:
- master
- develop
@@ -33,7 +28,7 @@ prebuild:
build:
stage: build
script:
- - docker build -t $TEST_IMAGE .
+ - docker build -t $TEST_IMAGE --build-arg TARGET_VERSION=${TARGET_VERSION} .
- docker push $TEST_IMAGE
only:
- master
@@ -42,9 +37,9 @@ build:
publish:
stage: publish
script:
- - docker build -t $RELEASE_IMAGE .
+ - docker build -t ${RELEASE_IMAGE}:latest --build-arg TARGET_VERSION=${TARGET_VERSION} .
- docker push ${RELEASE_IMAGE}:latest
- - docker tag $RELEASE_IMAGE ${RELEASE_IMAGE}:$(grep -oe '^ENV TARGET_VERSION=v\K(.*)$' Dockerfile)
- - docker push ${RELEASE_IMAGE}:$(grep -oe '^ENV TARGET_VERSION=v\K(.*)$' Dockerfile)
+ - docker tag ${RELEASE_IMAGE}:latest ${RELEASE_IMAGE}:${TARGET_VERSION_NUM}
+ - docker push ${RELEASE_IMAGE}:${TARGET_VERSION_NUM}
only:
- master
\ No newline at end of file
--
GitLab