diff --git a/Dockerfile b/Dockerfile index a85f7f9..6563918 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,9 +61,9 @@ RUN build_node.sh 18.20.5 & \ # https://www.python.org/downloads/ WORKDIR /usr/src ADD build_python.sh /usr/local/bin/build_python.sh -RUN build_python.sh 3.11.11 & \ - build_python.sh 3.12.8 & \ - build_python.sh 3.13.1 +RUN build_python.sh 3.11.11 +RUN build_python.sh 3.12.8 +RUN build_python.sh 3.13.1 ## PHP 8 # https://www.php.net/downloads.php @@ -75,8 +75,8 @@ RUN build_php8.sh 8.4.3 # https://www.ruby-lang.org/en/downloads/releases/ WORKDIR /usr/src ADD build_ruby.sh /usr/local/bin/build_ruby.sh -RUN build_ruby.sh 3.3.7 & \ - build_ruby.sh 3.4.1 +RUN build_ruby.sh 3.3.7 +RUN build_ruby.sh 3.4.1 ## Deno # From: https://github.com/denoland/deno/releases diff --git a/generate_versions.py b/generate_versions.py index ed81284..e4d85b4 100644 --- a/generate_versions.py +++ b/generate_versions.py @@ -19,12 +19,16 @@ with open("Dockerfile") as f: if line.startswith("FROM debian:"): image = line.split(" ")[1].strip() continue - if line.startswith("RUN build_"): + if "build_" in line and "ADD" not in line: + line = line.replace("RUN ", "").strip() + line = line.replace("& \\", "") + line = line.lstrip(" ") + parts = line.split(" ") - name = parts[1].replace("build_", "").replace(".sh", "") + name = parts[0].replace("build_", "").replace(".sh", "") if name.startswith("php"): name = "php" - version = line.split(" ")[2].strip() + version = parts[1].strip() if name not in output["techs"]: output["techs"][name] = { "versions": [], diff --git a/tests2.sh b/tests2.sh index 962e8f3..78e3bed 100644 --- a/tests2.sh +++ b/tests2.sh @@ -24,10 +24,10 @@ fi CONTAINER_NAME=dev_test $DOCKER stop $CONTAINER_NAME &>/dev/null -COUNT=`cat Dockerfile | grep -e "^RUN build_" | sed "s/RUN build_//" | sed "s/\.sh//" | sed "s/php8/php/" | wc -l` +COUNT=`cat Dockerfile | grep -e "build_" | grep -v "/usr/local" | sed "s/RUN //" | sed "s/ADD //" | sed 's/& \\\//' | sed "s/^[ ]*//" | sed "s/build_//" | sed "s/\.sh//" | sed "s/php8/php/" | wc -l` I=1 -cat Dockerfile | grep -e "^RUN build_" | sed "s/RUN build_//" | sed "s/\.sh//" | sed "s/php8/php/" | \ +cat Dockerfile | grep -e "build_" | grep -v "/usr/local" | sed "s/RUN //" | sed "s/ADD //" | sed 's/& \\//' | sed "s/^[ ]*//" | sed "s/build_//" | sed "s/\.sh//" | sed "s/php8/php/" | \ while read line do tech=`echo $line | cut -d " " -f 1`