JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Limit Jenkins to only one build at a time (#885)

Browse Source 
* Fix docker images, again

* Limit jenkins to only one build of a branch at a time
This commit is contained in:
Matt Robinson 2018-12-17 11:54:32 -05:00 committed by GitHub
parent 706f20611d
commit a5af25c9c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@ -1,4 +1,5 @@
node('node') {
disableConcurrentBuilds()
try {
currentBuild.result = "SUCCESS"

2
cmd/gateway/Dockerfile
View File

@ -5,7 +5,7 @@ FROM storjlabs/golang as build-env
# final stage
FROM alpine
ENV CONF_PATH=/root/.local/share/storj/uplink/config.yaml \
ENV CONF_PATH=/root/.local/share/storj/uplink \
API_KEY= \
SATELLITE_ADDR=
EXPOSE 7776/udp \

4
cmd/gateway/entrypoint
View File

@ -1,11 +1,11 @@
#!/bin/sh
set -euo pipefail
if [[ ! -f "${CONF_PATH}" ]]; then
if [[ ! -d "${CONF_PATH}" ]]; then
./gateway setup
fi
RUN_PARAMS="${RUN_PARAMS:-} --config ${CONF_PATH}"
RUN_PARAMS="${RUN_PARAMS:-} --config-dir ${CONF_PATH}"
if [[ -n "${API_KEY}" ]]; then
RUN_PARAMS="${RUN_PARAMS} --client.api-key ${API_KEY}"

2
cmd/satellite/Dockerfile
View File

@ -6,7 +6,7 @@ FROM storjlabs/golang as build-env
# final stage
FROM alpine
ENV API_KEY= \
CONF_PATH=/root/.local/share/storj/satellite/config.yaml \
CONF_PATH=/root/.local/share/storj/satellite \
OVERLAY_URL=redis://redis:6379/?db=0 \
BOOTSTRAP_ADDR=bootstrap.storj.io:8080
EXPOSE 7776/udp \

4
cmd/satellite/entrypoint
View File

@ -1,11 +1,11 @@
#!/bin/sh
set -euo pipefail
if [[ ! -f "${CONF_PATH}" ]]; then
if [[ ! -d "${CONF_PATH}" ]]; then
./satellite setup
fi
RUN_PARAMS="${RUN_PARAMS:-} --config ${CONF_PATH}"
RUN_PARAMS="${RUN_PARAMS:-} --config-dir ${CONF_PATH}"
if [[ -n "${OVERLAY_URL:-}" ]]; then
RUN_PARAMS="${RUN_PARAMS} --overlay.database-url ${OVERLAY_URL}"

2
cmd/storagenode/Dockerfile
View File

@ -5,7 +5,7 @@ FROM storjlabs/golang as build-env
# final stage
FROM alpine
ENV CONF_PATH=/root/.local/share/storj/storagenode/config.yaml \
ENV CONF_PATH=/root/.local/share/storj/storagenode \
SATELLITE_ADDR=
EXPOSE 7776/udp \
7777

4
cmd/storagenode/entrypoint
View File

@ -1,11 +1,11 @@
#!/bin/sh
set -euo pipefail
if [[ ! -f "${CONF_PATH}" ]]; then
if [[ ! -d "${CONF_PATH}" ]]; then
./storagenode setup
fi
RUN_PARAMS="${RUN_PARAMS:-} --config ${CONF_PATH}"
RUN_PARAMS="${RUN_PARAMS:-} --config-dir ${CONF_PATH}"
if [ -n "${SATELLITE_ADDR:-}" ]; then
RUN_PARAMS="${RUN_PARAMS} --kademlia.bootstrap-addr $SATELLITE_ADDR"