Skip to content

Entrypoint fixes for CA certificates feature #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gdams merged 3 commits into from
Aug 14, 2023
Merged

Entrypoint fixes for CA certificates feature #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa0da27
Relocate entrypoint script to a less common location
rassie Aug 14, 2023
08b1402
Use bash as shebang in entrypoint scripts
rassie Aug 14, 2023
b1af31e
Apply suggestions from code review
gdams Aug 14, 2023
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
7 changes: 4 additions & 3 deletions dockerfile_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ print_alpine_musl_pkg() {
cat >> "$1" <<'EOI'
# fontconfig and ttf-dejavu added to support serverside image generation by Java programs
# java-cacerts added to support adding CA certificates to the Java keystore
RUN apk add --no-cache fontconfig java-cacerts libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
# bash is required for the entrypoint script (s. https://github.com/adoptium/containers/issues/415)
RUN apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
&& rm -rf /var/cache/apk/*
EOI
}
Expand Down Expand Up @@ -855,8 +856,8 @@ print_entrypoint() {
cat "scripts/entrypoint.$2.sh" > "$dir/entrypoint.sh"
chmod +x "$dir/entrypoint.sh"
cat >> "$1" <<EOI
COPY entrypoint.sh /
ENTRYPOINT ["/entrypoint.sh"]
COPY entrypoint.sh /__cacert_entrypoint.sh
ENTRYPOINT ["/__cacert_entrypoint.sh"]
EOI
}

Expand Down
3 changes: 2 additions & 1 deletion scripts/entrypoint.alpine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env sh
#!/usr/bin/env bash
# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details

set -e

Expand Down
1 change: 1 addition & 0 deletions scripts/entrypoint.ubi9-minimal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details

set -e

Expand Down