@leverege/build-tools 2.29.0 → 2.30.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
package/src/circleate
CHANGED
package/src/dockreate
CHANGED
|
@@ -69,7 +69,7 @@ strip_undefined() {
|
|
|
69
69
|
# $3 = additional packages to install (htop redis-cli etc)
|
|
70
70
|
create_Dockerfile() {
|
|
71
71
|
local regvers="${1}"
|
|
72
|
-
local nodeimg="${2:-
|
|
72
|
+
local nodeimg="${2:-hydrogen-alpine}"
|
|
73
73
|
local apkadds="${3}"
|
|
74
74
|
|
|
75
75
|
echo "Creating the Dockerfile for node ${nodeimg}"
|
|
@@ -220,7 +220,7 @@ fi
|
|
|
220
220
|
|
|
221
221
|
# TODO: these should be combined into one require
|
|
222
222
|
nodeimg=$(packageJson '.leverege.nodeimg')
|
|
223
|
-
nodeimg="${nodeimg:-
|
|
223
|
+
nodeimg="${nodeimg:-hydrogen-alpine}"
|
|
224
224
|
nodeops=$(packageJson '.leverege.nodeops')
|
|
225
225
|
apkadds=$(packageJson '.leverege.apkadds')
|
|
226
226
|
runuser=$(packageJson '.leverege.runuser')
|
|
@@ -399,8 +399,13 @@ else
|
|
|
399
399
|
gcloud config unset builds/use_kaniko
|
|
400
400
|
fi
|
|
401
401
|
|
|
402
|
-
#
|
|
403
|
-
|
|
402
|
+
# need a logging area outside of the default cloud build bucket in order
|
|
403
|
+
# to enable 3rd party builders from outside of leverege.com user space
|
|
404
|
+
buildlogs="--gcs-log-dir gs://leverege-docker-images_cloudbuild/logs"
|
|
405
|
+
|
|
406
|
+
# submit the build request to gcloud with logs directed to the cloudbuild
|
|
407
|
+
# logging bucket from the docker directory
|
|
408
|
+
time gcloud builds submit $buildlogs --tag $gcimage:$version .
|
|
404
409
|
|
|
405
410
|
if [ $? -ne 0 ];
|
|
406
411
|
then
|
|
@@ -7,11 +7,15 @@ metadata:
|
|
|
7
7
|
name: letsencrypt-prd
|
|
8
8
|
spec:
|
|
9
9
|
acme:
|
|
10
|
+
# production
|
|
11
|
+
#server: https://acme-v02.api.letsencrypt.org/directory
|
|
12
|
+
# staging
|
|
13
|
+
server: https://acme-staging-v02.api.letsencrypt.org/directory
|
|
14
|
+
#
|
|
10
15
|
# You must replace this email address with your own.
|
|
11
16
|
# Let's Encrypt will use this to contact you about expiring
|
|
12
17
|
# certificates, and issues related to your account.
|
|
13
18
|
email: devops@leverege.com
|
|
14
|
-
server: https://acme-v02.api.letsencrypt.org/directory
|
|
15
19
|
privateKeySecretRef:
|
|
16
20
|
# Secret resource used to store the account's private key.
|
|
17
21
|
name: issuer-account-key
|
|
@@ -4,7 +4,9 @@ addHelmRepo jetstack https://charts.jetstack.io
|
|
|
4
4
|
[ -z "$CERT_MANAGER_CHART_VERSION" ] && CERT_MANAGER_CHART_VERSION="v1.10"
|
|
5
5
|
helm upgrade --install cert-manager jetstack/cert-manager \
|
|
6
6
|
--namespace cert-manager --set installCRDs=true \
|
|
7
|
-
--version $CERT_MANAGER_CHART_VERSION
|
|
7
|
+
--version $CERT_MANAGER_CHART_VERSION $HELM_WHAT
|
|
8
|
+
|
|
9
|
+
[ ! -z "$HELM_WHAT" ] && exit 0
|
|
8
10
|
|
|
9
11
|
cat<<DELAY
|
|
10
12
|
|