Merge pull request #1600 from bradrydzewski/master
bump docker version to 0.4.2 in preparation for 0.5
This commit is contained in:
commit
73f9c44d7f
3 changed files with 43 additions and 2 deletions
|
@ -1 +1 @@
|
||||||
eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.r4ScD0KSIWeQR-1OfO7OkmSOk12y1hmqCt2keJ1i3VZD-9wYtTV2PnkpUMkgAp0teUVpmR1n6ndbLAYsUljro2KYMH1PrWI9pRA9aZNWZr-aVTjHMDJFXWgMr6ecxN9bmYMwzv0lAJWRcrvPdyhr3yaiGsnjYH7c9FZGUMDwh191sK7iRdFfDNbYF6AMY2_2pkrUIkyMdPPK1FF0ILsSHHXHgUPSMCfURvaKF2MrVSccHP5fQk-9q5mdob79UkGAqtMHAyFq0dPmBQvZrKSVkDBEYp7exwGLs8bJqx3QFCmN7sXN6DXtJlNdCe616dzzfLDMZ4-qG5UEv74VR6lX8w.mDyt_QqhOtpAfO8t.b277f0m6GO1B3pWE6jctayN2_HdmfhPG4nXjkD__p9Y5ktRfQK4QMiOj4sQPny1yxxBvvyKOlVB7tQ9fSivWnACVnJFZieZ6FmoEtHsf63tZadS5idEkF5S0zY8OSaBZ6SuHb3omrOI1xmz53TXLcI5Ox-7xVMelWT53FTkFZ-s7fBc3p2zYIvDHv17rhEk6ocGDI_euHnbjT-r3nGroESVnMPBynTw8PhhR3EOENgoTH4rcH3xLK3yOjHKNl5RPkfrIUawpeSNBQMCsFVZIgvGwGFnmoJ4Y4ASRQWnL0iupycP45k_NYD_-d3UDJD02B_2GPNY6OHzp-OFbBDXlov5tmVzA0WzPSxbbSWhMdgEzJthhpPuZ_77lZ4cwx01UgCAiJA.akTuVfyRAJ8CYP-aCoOVIg
|
eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.Y_yR-WIrz_Shk94TlGh1mhLM5NocQeh1nRTz65Hfn8jo78WtVF9ZDUQsf6z2bpipTp4y0TmSjWHLvQHQf1O_LZ-AxLHkG3_XGqeWl7Jd3lE_xsBeWeOIrC3QKx8dNiyU0FKVCoPwfaMpjpXAFpG4ZesNfpTrxaaoT-0PBYYpbVvAi-lIhh5lqKSDlWRkrzR3pvzLPeY-Pq4yb-DE0wLzAOh5nasde3qIKo9VT2fnRQIPIIC6V4vNyi7EdYDhNcdgx9LCFKIYVkCPRRI1R9mG8tyjpLy47t0gs3y-Gcr8MyNE1lPlToX4JaQ4EKcZZAAf2CVCJ92s1Bp6CZWLiFt9aQ.RoWDoMbR2ICXQPlo.7d_JtqJvLPPAdmIMOoD961rO7KZXwY-Fz8GHx98hdHqr27igkoKm1BXqYqlh043wKkHwVaAy5jNAOUdweJKrb5YJGPdk3Lyh4ZpEDvcAiwPgwsf4_Q1Xhw9A1jSOyapFlaSAR2aKj_370yx0y8htgxTeXj5Nv5n7ZZ4ezYstU8xCF9JxzsBxOfFACqiyZr9ZJcm-47mlftcU1nZy1x9005Vq6oZv9FAk4zwKLpjMC3KC3H252PqbL_U-e9j1i5tlrcDiEkW8gLoMq_RbMj5J6w3j0u4eoUV5e-WfjentG5ZIf_e8c8-oKxXF2A1vdVdswzWhQWoIEs2KDqBWmSPsCNHKHE2t4grnDPxipMJByAUSsEE9_NVWRS2ofjw01YpQd8cRV6v-eKBlF-c1QD4ABqBu0iMYTEuScg.AAAOUFIZbiVDhUdpARCZ9g
|
|
@ -35,7 +35,7 @@ publish:
|
||||||
password: $$DOCKER_PASS
|
password: $$DOCKER_PASS
|
||||||
email: $$DOCKER_EMAIL
|
email: $$DOCKER_EMAIL
|
||||||
repo: drone/drone
|
repo: drone/drone
|
||||||
tag: [ "latest" ]
|
tag: [ "latest", "0.4.2" ]
|
||||||
when:
|
when:
|
||||||
repo: drone/drone
|
repo: drone/drone
|
||||||
branch: master
|
branch: master
|
||||||
|
|
|
@ -2,6 +2,7 @@ package server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/drone/drone/router"
|
"github.com/drone/drone/router"
|
||||||
|
@ -48,11 +49,26 @@ var ServeCmd = cli.Command{
|
||||||
Name: "experimental",
|
Name: "experimental",
|
||||||
Usage: "start the server with experimental features",
|
Usage: "start the server with experimental features",
|
||||||
},
|
},
|
||||||
|
cli.BoolFlag{
|
||||||
|
Name: "agreement.ack",
|
||||||
|
EnvVar: "I_UNDERSTAND_I_AM_USING_AN_UNSTABLE_VERSION",
|
||||||
|
Usage: "agree to terms of use.",
|
||||||
|
},
|
||||||
|
cli.BoolFlag{
|
||||||
|
Name: "agreement.fix",
|
||||||
|
EnvVar: "I_AGREE_TO_FIX_BUGS_AND_NOT_FILE_BUGS",
|
||||||
|
Usage: "agree to terms of use.",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
func start(c *cli.Context) error {
|
func start(c *cli.Context) error {
|
||||||
|
|
||||||
|
if c.Bool("agreement.ack") == false || c.Bool("agreement.fix") == false {
|
||||||
|
println(agreement)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
// debug level if requested by user
|
// debug level if requested by user
|
||||||
if c.Bool("debug") {
|
if c.Bool("debug") {
|
||||||
logrus.SetLevel(logrus.DebugLevel)
|
logrus.SetLevel(logrus.DebugLevel)
|
||||||
|
@ -87,3 +103,28 @@ func start(c *cli.Context) error {
|
||||||
handler,
|
handler,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var agreement = `
|
||||||
|
---
|
||||||
|
|
||||||
|
|
||||||
|
You are attempting to use the unstable channel. This build is experimental and
|
||||||
|
has known bugs and compatibility issues, and is not intended for general use.
|
||||||
|
|
||||||
|
Please consider using the latest stable release instead:
|
||||||
|
|
||||||
|
drone/drone:0.4.2
|
||||||
|
|
||||||
|
If you are attempting to build from source please use the latest stable tag:
|
||||||
|
|
||||||
|
v0.4.2
|
||||||
|
|
||||||
|
If you are interested in testing this experimental build and assisting with
|
||||||
|
development you will need to set the following environment variables to proceed:
|
||||||
|
|
||||||
|
I_UNDERSTAND_I_AM_USING_AN_UNSTABLE_VERSION=true
|
||||||
|
I_AGREE_TO_FIX_BUGS_AND_NOT_FILE_BUGS=true
|
||||||
|
|
||||||
|
|
||||||
|
---
|
||||||
|
`
|
||||||
|
|
Loading…
Reference in a new issue