This repository was archived by the owner on Feb 11, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +20
-8
lines changed
images/base/helper-scripts Expand file tree Collapse file tree 4 files changed +20
-8
lines changed Original file line number Diff line number Diff line change 4848 uses : docker/setup-buildx-action@v2
4949
5050 - name : Build github-actions-runner:base
51- uses : docker/build-push-action@v3
51+ uses : docker/build-push-action@v4
5252 with :
5353 context : ./images/base
5454 push : true
8383 images/${{ matrix.flavour }}/Dockerfile
8484
8585 - name : Build github-actions-runner:${{ matrix.flavour }}
86- uses : docker/build-push-action@v3
86+ uses : docker/build-push-action@v4
8787 with :
8888 context : ./images/${{ matrix.flavour }}
89- push : true
89+ push : false
9090 tags : |
9191 ${{ env.IMAGE_BASE }}:${{ matrix.flavour }}-pr-${{ github.event.pull_request.number }}
Original file line number Diff line number Diff line change 5959 uses : docker/setup-buildx-action@v2
6060
6161 - name : Build github-actions-runner:base
62- uses : docker/build-push-action@v3
62+ uses : docker/build-push-action@v4
6363 with :
6464 context : ./images/base
6565 push : true
9898 images/${{ matrix.flavour }}/Dockerfile
9999
100100 - name : Build github-actions-runner:${{ matrix.flavour }}
101- uses : docker/build-push-action@v3
101+ uses : docker/build-push-action@v4
102102 with :
103103 context : ./images/${{ matrix.flavour }}
104104 push : true
Original file line number Diff line number Diff line change 1+ {
2+ "recommendations" : [
3+ " shakram02.bash-beautify"
4+ ]
5+ }
Original file line number Diff line number Diff line change @@ -17,18 +17,25 @@ if command -v java --version &> /dev/null; then
1717 echo " generating single certs at $javacerts /"
1818 mkdir -p $javacerts
1919 cat $CA_FILE | awk ' split_after==1{n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1} {print > ("/tmp/javacerts/cert" n ".crt")}'
20-
20+
2121 for f in $javacerts /* .crt ; do
2222 # delete empty lines in files
2323 sed -i ' /^$/d' $f
2424 done
2525 # delete empty files to prevent errors at import
2626 find $javacerts -empty -delete
27-
27+
28+ java_version=$( java -version 2>&1 | awk -F ' "' ' /version/ {print $2}' )
2829 for x in $javacerts /* .crt ; do
2930 alias=$( openssl x509 -noout -subject -in " $x " | awk -F= ' {print $NF}' | sed -e ' s/^[ \t]*//' | sed -e ' s/ /_/g' )
3031 echo " importing cert of $alias "
31- keytool -importcert -alias $alias -keystore /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/jre/lib/security/cacerts -storepass changeit -file $x -noprompt
32+ if [[ " $java_version " > " 1.8" ]]; then
33+ echo " using java greater 1.8"
34+ keytool -importcert -alias $alias -cacerts -storepass changeit -file $x -noprompt
35+ else
36+ echo " using java lower 1.8"
37+ keytool -importcert -alias $alias -keystore /usr/lib/jvm/adopt* /jre/lib/security/cacerts -storepass changeit -file $x -noprompt
38+ fi
3239 done
3340 rm -rf $javacerts
3441fi
You can’t perform that action at this time.
0 commit comments