Skip to content

Commit

Permalink
rename Dockerfiles to improve syntax highlighting and simplify scripts (
Browse files Browse the repository at this point in the history
#437)

* rename Dockerfiles

* add badge to readme
  • Loading branch information
gdams authored Oct 20, 2023
1 parent 06a1f67 commit 8447c47
Show file tree
Hide file tree
Showing 71 changed files with 9 additions and 5 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Containers

[![Docker Stars](https://img.shields.io/docker/stars/_/eclipse-temurin?style=flat-square)](https://hub.docker.com/r/_/eclipse-temurin)
[![DockerPulls](https://img.shields.io/docker/pulls/_/eclipse-temurin?label=Docker%20Pulls)](https://hub.docker.com/_/eclipse-temurin)

This repository contains the Dockerfiles for the official [Adoptium](https://adoptium.net) images of the Eclipse Temurin distribution (OpenJDK). These images are made available in Docker Hub.
Expand Down
8 changes: 5 additions & 3 deletions dockerhub_doc_config_update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ do
do
for os in ${oses}
do
for file in $(find . -name "Dockerfile.*" | grep "/${ver}" | grep "${pkg}" | grep "${os}" | sort -n)
for file in $(find . -name "Dockerfile" | grep "/${ver}" | grep "${pkg}" | grep "${os}" | sort -n)
do
# file will look like ./19/jdk/alpine/Dockerfile.releases.full
# dockerfile name
Expand All @@ -232,9 +232,11 @@ do
dfdir=$(dirname $file | cut -c 3-)
os=$(echo "${file}" | awk -F '/' '{ print $4 }')
# build = release or nightly
build=$(echo "${dfname}" | awk -F "." '{ print $3 }')
# build=$(echo "${dfname}" | awk -F "." '{ print $3 }')
build="release"
# btype = full or slim
btype=$(echo "${dfname}" | awk -F "." '{ print $4 }')
# btype=$(echo "${dfname}" | awk -F "." '{ print $4 }')
build="full"
generate_official_image_info
done
done
Expand Down
4 changes: 3 additions & 1 deletion update_multiarch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ do
# Generate all the Dockerfiles for each of the builds and build types
for btype in ${btypes}
do
file="${dir}/Dockerfile.${build}.${btype}"
# file="${dir}/Dockerfile.${build}.${btype}"
# Reenable the line above if we ever start doing multi build types
file="${dir}/Dockerfile"
generate_dockerfile "${file}" "${package}" "${build}" "${btype}" "${osfamily}" "${os}"
# Copy the script to generate slim builds.
if [ "${btype}" = "slim" ]; then
Expand Down

0 comments on commit 8447c47

Please sign in to comment.