Skip to content
This repository was archived by the owner on Feb 11, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Build github-actions-runner:base
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: ./images/base
push: true
Expand Down Expand Up @@ -83,9 +83,9 @@ jobs:
images/${{ matrix.flavour }}/Dockerfile

- name: Build github-actions-runner:${{ matrix.flavour }}
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: ./images/${{ matrix.flavour }}
push: true
push: false
tags: |
${{ env.IMAGE_BASE }}:${{ matrix.flavour }}-pr-${{ github.event.pull_request.number }}
4 changes: 2 additions & 2 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Build github-actions-runner:base
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: ./images/base
push: true
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
images/${{ matrix.flavour }}/Dockerfile

- name: Build github-actions-runner:${{ matrix.flavour }}
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: ./images/${{ matrix.flavour }}
push: true
Expand Down
5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"shakram02.bash-beautify"
]
}
13 changes: 10 additions & 3 deletions images/base/helper-scripts/detect-setup.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,25 @@ if command -v java --version &> /dev/null; then
echo "generating single certs at $javacerts/"
mkdir -p $javacerts
cat $CA_FILE | awk 'split_after==1{n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1} {print > ("/tmp/javacerts/cert" n ".crt")}'

for f in $javacerts/*.crt ; do
# delete empty lines in files
sed -i '/^$/d' $f
done
# delete empty files to prevent errors at import
find $javacerts -empty -delete


java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
for x in $javacerts/*.crt ; do
alias=$(openssl x509 -noout -subject -in "$x" | awk -F= '{print $NF}' | sed -e 's/^[ \t]*//' | sed -e 's/ /_/g')
echo "importing cert of $alias"
keytool -importcert -alias $alias -keystore /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/jre/lib/security/cacerts -storepass changeit -file $x -noprompt
if [[ "$java_version" > "1.8" ]]; then
echo "using java greater 1.8"
keytool -importcert -alias $alias -cacerts -storepass changeit -file $x -noprompt
else
echo "using java lower 1.8"
keytool -importcert -alias $alias -keystore /usr/lib/jvm/adopt*/jre/lib/security/cacerts -storepass changeit -file $x -noprompt
fi
done
rm -rf $javacerts
fi
Expand Down