Skip to content

Commit ed6d4a0

Browse files
Different patching depending on deployment
Signed-off-by: Lukasz Gryglicki <[email protected]>
1 parent 6a1ebdf commit ed6d4a0

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

images/Dockerfile.full

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ ADD devstatscode.tar .
77
ADD devstats-docker-images.tar .
88
ADD grafana-bins.tar .
99
RUN cp replacer patches/patch.sh /usr/bin/
10-
RUN patch.sh testsrv devstats-demo.net
10+
RUN patch.sh testsrv devstats-demo.net 'cncf prometheus'
11+
RUN patch.sh testsrv devstats.graphql.org 'graphql graphqljs graphiql expressgraphql graphqlspec'
1112
RUN make -f ./images/Makefile.full dockerinstall
1213
RUN make -f ./images/Makefile.full links
1314
FROM alpine

images/Dockerfile.minimal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ ADD devstatscode.tar .
77
ADD devstats-docker-images.tar .
88
ADD grafana-bins.tar .
99
RUN cp replacer patches/patch.sh /usr/bin/
10-
RUN patch.sh testsrv devstats-demo.net
10+
RUN patch.sh testsrv devstats-demo.net 'cncf prometheus'
11+
RUN patch.sh testsrv devstats.graphql.org 'graphql graphqljs graphiql expressgraphql graphqlspec'
1112
RUN make -f ./images/Makefile.minimal dockerinstall
1213
FROM alpine
1314
RUN apk add git bash

patches/patch.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ then
99
echo "$0: you need to specify hostname: devstats-demo.net, graphql.devstats.org etc."
1010
exit 2
1111
fi
12+
if [ -z "$3" ]
13+
then
14+
echo "$0: projects to patch not specified, assuming all"
15+
projs="."
16+
else
17+
projs="$3"
18+
fi
1219
if [ "$1" = "prodsrv" ]
1320
then
1421
fromh='devstats.cncf.io'
@@ -19,7 +26,8 @@ else
1926
echo "$0: 1st arg must be either prodsrv or testsrv, got: $1"
2027
exit 3
2128
fi
22-
files=`find ./metrics/ -name vars.yaml -o -name sync_vars.yaml` || exit 4
29+
cd metrics || exit 4
30+
files=`find $projs -name vars.yaml -o -name sync_vars.yaml` || exit 5
2331
for fn in $files
2432
do
2533
echo "Patching $fn"

0 commit comments

Comments
 (0)