Skip to content

Add Oracle Linux image variants #680

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
merged 1 commit into from
Feb 17, 2022
Merged

Add Oracle Linux image variants #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
108 changes: 108 additions & 0 deletions 5.7/Dockerfile.oracle
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

111 changes: 111 additions & 0 deletions 8.0/Dockerfile.oracle
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 12 additions & 9 deletions apply-templates.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,18 @@ generated_warning() {
for version; do
export version

debianVersion="$(jq -r '.[env.version].debian // ""' versions.json)"
if [ -n "$debianVersion" ]; then
dockerfile='Dockerfile.debian'

{
generated_warning
gawk -f "$jqt" "template/$dockerfile"
} > "$version/$dockerfile"
fi
for variant in oracle debian; do
export variant

variantVersion="$(jq -r '.[env.version][env.variant] // {} | .version // ""' versions.json)"
if [ -n "$variantVersion" ]; then
dockerfile="Dockerfile.$variant"
{
generated_warning
gawk -f "$jqt" "template/$dockerfile"
} > "$version/$dockerfile"
fi
done

cp -a template/docker-entrypoint.sh "$version/docker-entrypoint.sh"
done
39 changes: 30 additions & 9 deletions generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ declare -A aliases=(
[8.0]='8 latest'
)

defaultDefaultVariant='oracle'
declare -A defaultVariants=(
[5.7]='debian'
[8.0]='debian'
)

self="$(basename "$BASH_SOURCE")"
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

Expand Down Expand Up @@ -58,9 +64,8 @@ join() {

for version; do
export version
df='Dockerfile.debian'
commit="$(dirCommit "$version" "$df")"

defaultVariant="${defaultVariants[$version]:-$defaultDefaultVariant}"
fullVersion="$(jq -r '.[env.version].version' versions.json)"

versionAliases=()
Expand All @@ -73,11 +78,27 @@ for version; do
${aliases[$version]:-}
)

echo
cat <<-EOE
Tags: $(join ', ' "${versionAliases[@]}")
GitCommit: $commit
Directory: $version
File: $df
EOE
for variant in oracle debian; do
df="Dockerfile.$variant"
commit="$(dirCommit "$version" "$df")"

variantAliases=( "${versionAliases[@]/%/-$variant}" )
variantAliases=( "${variantAliases[@]//latest-/}" )
if [ "$variant" = "$defaultVariant" ]; then
variantAliases=( "${versionAliases[@]}" "${variantAliases[@]}" )
fi

# TODO if the list of architectures supported by MySQL ever is greater than that of the base image it's FROM, this list will need to be filtered
export variant
variantArches="$(jq -r '.[env.version][env.variant].architectures | join(", ")' versions.json)"

echo
cat <<-EOE
Tags: $(join ', ' "${variantAliases[@]}")
Architectures: $variantArches
GitCommit: $commit
Directory: $version
File: $df
EOE
done
done
Loading