remove unused variables

define ARG only if needed, allow jinja2 control flow in package names
make PKG_VERSION into a dictionary of PKG_VERSIONS
2024-11-06 21:25:14 +03:00 · 2024-11-06 21:23:24 +03:00 · 2024-11-06 20:57:26 +03:00 · 2024-11-06 20:57:26 +03:00 · 2024-11-06 20:57:26 +03:00 · 2024-11-06 19:51:40 +03:00
7 changed files with 40 additions and 58 deletions
--- a/.gitea/workflows/wf_full_p10.yaml
+++ b/.gitea/workflows/wf_full_p10.yaml
@@ -36,10 +36,10 @@ jobs:
        uses: actions/init-alt-env@v1
      - name: Install requires
        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl
-          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch"
-          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch         
+          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl"
+          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
+          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc"
+          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc          
      - name: Check out current repo
        uses: actions/checkout@v4
      - name: Parse target branch and tag from events context, save to env                                
@@ -61,7 +61,7 @@ jobs:
      - name: Run building script
        id: build-script
        run: |
-          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel --arches amd64 386 arm64"          
+          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel"          
          if [[ $ORG == 'k8s' ]]; then build_args="$build_args --tags tags.toml --overwrite-organization $ORG-$BR --skip-images k8s/kube-apiserver k8s/kube-controller-manager k8s/kube-proxy k8s/kube-scheduler"; fi
          echo "build.py $build_args"
          ${{ gitea.workspace }}/build.py $build_args
--- a/.gitea/workflows/wf_full_p11.yaml
+++ b/.gitea/workflows/wf_full_p11.yaml
@@ -36,10 +36,10 @@ jobs:
        uses: actions/init-alt-env@v1
      - name: Install requires
        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl
-          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch"
-          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch
+          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl"
+          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
+          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc"
+          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc          
      - name: Check out current repo
        uses: actions/checkout@v4
      - name: Parse target branch and tag from events context, save to env                                
@@ -61,7 +61,7 @@ jobs:
      - name: Run building script
        id: build-script
        run: |
-          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel --arches amd64 386 arm64"          
+          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel"          
          if [[ $ORG == 'k8s' ]]; then build_args="$build_args --tags tags.toml --overwrite-organization $ORG-$BR --skip-images k8s/kube-apiserver k8s/kube-controller-manager k8s/kube-proxy k8s/kube-scheduler"; fi
          echo "build.py $build_args"
          ${{ gitea.workspace }}/build.py $build_args
--- a/.gitea/workflows/wf_full_sis.yaml
+++ b/.gitea/workflows/wf_full_sis.yaml
@@ -29,33 +29,33 @@ jobs:
        uses: actions/init-alt-env@v1
      - name: Install requires
        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl
-          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch"
-          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch
+          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl"
+          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
+          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc"
+          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc          
      - name: Check out current repo
        uses: actions/checkout@v4
-      - name: Parse target branch and tag from events context, save to env
+      - name: Parse target branch and tag from events context, save to env                                
        env:
-          EV: ${{ toJson(gitea.event) }}
+          EV: ${{ toJson(gitea.event) }}                                         
        run: |
          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1
          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1 >> ${GITHUB_ENV}
          org=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
-          echo "ORG=$org" >> ${GITHUB_ENV}
+          echo "ORG=$org" >> ${GITHUB_ENV}                              
          echo "ORG=$org"
      - name: Login podman gitea
        run: |
          echo "podman login ${{ env.URL }}"
-          podman login --username $P_USER --password $P_PASS ${{ env.URL }}
+          podman login --username $P_USER --password $P_PASS ${{ env.URL }}          
        env:
          P_USER: ${{ secrets.PODMAN_USER }}
          P_PASS: ${{ secrets.PODMAN_PASS }}
      - name: Run building script
        id: build-script
        run: |
-          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel --arches amd64 386 arm64 loong64"          
-          if [[ $ORG == 'k8s' ]]; then build_args="$build_args --overwrite-organization $ORG-$BR --package-versions {\"k8s/kube-apiserver\":\"1.31\",\"k8s/kube-scheduler\":\"1.31\",\"k8s/kube-controller-manager\":\"1.31\",\"k8s/kube-proxy\":\"1.31\",\"k8s/coredns\":\"1.11.3\"}"; fi
+          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel"          
+          if [[ $ORG == 'k8s' ]]; then build_args="$build_args --tags tags.toml --overwrite-organization $ORG-$BR --skip-images k8s/kube-apiserver k8s/kube-controller-manager k8s/kube-proxy k8s/kube-scheduler"; fi
          echo "build.py $build_args"
          ${{ gitea.workspace }}/build.py $build_args
        env:
@@ -78,7 +78,7 @@ jobs:
        run: |
          tagname=$(echo $EV | jq '.ref' -r | sed "s/refs\/tags\///g")
          curl -X 'DELETE' "$URL/api/v1/repos/$REPO/image-forge/tags/$tagname?token=$T" -H 'accept: application/json' -s
-          echo "tag $tagname is deleted"
+          echo "tag $tagname is deleted"                    
        env:
          T: ${{ secrets.TOKEN }}
          BR: ${{ env.BRANCH }}
@@ -87,7 +87,7 @@ jobs:
          EV: ${{ toJson(gitea.event) }}
  test-process:
    needs: build-process
-    if: ${{ needs.build-process.outputs.buildres == 'success' && needs.build-process.outputs.org != 'k8s' }}
+    if: ${{ needs.build-process.outputs.buildres == 'success' }}
    runs-on: alt-sisyphus
    steps:
      - name: Update apt
--- a/.gitea/workflows/wf_single.yaml
+++ b/.gitea/workflows/wf_single.yaml
@@ -2,7 +2,7 @@ name: Building alt images
 on:
  push:
    tags:
-      - '*_*/*_*'
+      - '*_*/*'

 jobs:
  build-process:
@@ -37,10 +37,10 @@ jobs:
        uses: actions/init-alt-env@v1
      - name: Install requires
        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl
-          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch"
-          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch
+          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl"
+          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
+          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc"
+          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc          
      - name: Check out current repo
        uses: actions/checkout@v4
      - name: Login podman gitea
@@ -52,39 +52,34 @@ jobs:
          P_PASS: ${{ secrets.PODMAN_PASS }}
      - name: Check files in the repository
        run: |
-          ls -a ${{ gitea.workspace }}
+          ls -a ${{ gitea.workspace }}          
      - name: Parse target branch and tag from events context, save to env                                
        env:
-          EV: ${{ toJson(gitea.event) }}
+          EV: ${{ toJson(gitea.event) }}                                         
        run: |
          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1
          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1 >> ${GITHUB_ENV}
          localimage=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
-          echo "IMAGE=$localimage" >> ${GITHUB_ENV}
+          echo "IMAGE=$localimage" >> ${GITHUB_ENV}                              
          echo "IMAGE=$localimage"
          org=$(echo "$localimage" | cut -d '/' -f 1)
          echo "ORG=$org" >> ${GITHUB_ENV}
          echo "ORG=$org"
-          ver=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 3)
-          echo "VER=$ver" >> ${GITHUB_ENV}
-          echo "VER=$ver"
      - name: Get test for image
        run: |
          if test -f ${{ gitea.workspace }}/org/$IM/test; then testscript=$(cat ${{ gitea.workspace }}/org/$IM/test); else testscript=""; fi
-          echo "TEST=$testscript" >> ${GITHUB_ENV}
-        env:
+          echo "TEST=$testscript" >> ${GITHUB_ENV}          
+        env:                                     
          IM: ${{ env.IMAGE }}
          BR: ${{ env.BRANCH }}
      - name: Run building script
        id: build-script
        run: |
-          if [[ "$IM" == *"k8s"* ]]; then k8sarg="--overwrite-organization $ORG-$BR --package-versions {\"$IM\":\"$VER\"}"; else k8sarg=""; fi
-          if [[ "$BR" = "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64"; else arches="--arches amd64 386 arm64"; fi
+          if [[ "$IM" == *"k8s"* ]]; then k8sarg="--tags=tags.toml --overwrite-organization $ORG-$BR"; else k8sarg=""; fi
          echo "build.py -i $IM -b $BR"
-          ${{ gitea.workspace }}/build.py -i $IM -b $BR $arches $k8sarg 
+          ${{ gitea.workspace }}/build.py -i $IM -b $BR $k8sarg        
        env:
          IM: ${{ env.IMAGE }}
-          VER: ${{ env.VER }}
          BR: ${{ env.BRANCH }}
          ORG: ${{ env.ORG }}
        continue-on-error: true
@@ -94,7 +89,7 @@ jobs:
          issueid=1
          body="Building image $IM finish with some errors."
          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid" 
+          echo "notification about test error is sent to issue $issueid"          
        env:
          T: ${{ secrets.TOKEN }}
          BR: ${{ env.BRANCH }}
@@ -105,7 +100,7 @@ jobs:
        run: |
          tagname=$(echo $EV | jq '.ref' -r | sed "s/refs\/tags\///g")
          curl -X 'DELETE' "$URL/api/v1/repos/$REPO/image-forge/tags/$tagname?token=$T" -H 'accept: application/json' -s
-          echo "tag $tagname is deleted"
+          echo "tag $tagname is deleted"                              
        env:
          T: ${{ secrets.TOKEN }}
          BR: ${{ env.BRANCH }}
@@ -129,7 +124,7 @@ jobs:
        continue-on-error: true
        run: |
          if [[ "$IM" == *"k8s"* ]]; then echo "skip tests for k8s images"; else podman run --rm --entrypoint="/bin/sh" $URL/$IM:$BR -c "$TEST"; fi
-        env:
+        env:                
          IM: ${{ needs.build-process.outputs.image }} 
          BR: ${{ needs.build-process.outputs.branch }}
          URL: ${{ needs.build-process.outputs.url }}  
--- a/build.py
+++ b/build.py
@@ -729,7 +729,7 @@ class ImagesInfo:

 def parse_args():
    stages = ["build", "remove_dockerfiles", "render_dockerfiles", "push"]
-    arches = ["amd64", "386", "arm64", "loong64", "riscv64"]
+    arches = ["amd64", "386", "arm64"]
    branches = ["p11", "p10", "sisyphus", "c10f1", "c10f2"]
    organizations = list(ORG_DIR.iterdir())
    images = [f"{o.name}/{i.name}" for o in organizations for i in o.iterdir()]
--- a/images-info.toml
+++ b/images-info.toml
@@ -6,9 +6,3 @@ skip-arches = [ "386" ]

 ["alt/ansible"]
 skip-branches = [ "c10f2", "c10f1", "p10" ]
-
-["alt/distroless-base"]
-skip-arches = [ "loong64" ]
-
-["alt/distroless-gotop"]
-skip-arches = [ "loong64" ]
--- a/org/alt/php/Dockerfile.template
+++ b/org/alt/php/Dockerfile.template
@@ -8,14 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/php/php-src"
 LABEL org.opencontainers.image.licenses="PHP-3.01"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{% if branch == 'p10' %}
 {{ install_packages(
-	"php8.2",
-	"php8.2-xdebug",
+"php8.2",
+"php8.2-xdebug",
 ) }}
-{% else %}
-{{ install_packages(
-	"php8.3",
-	"php8.3-xdebug",
-) }}
-{% endif %}
Author	SHA1	Message	Date
Alexander Stepchenko	57bcce92b5	remove unused variables	2024-11-06 21:25:14 +03:00
Alexander Stepchenko	c553e50d53	define ARG only if needed, allow jinja2 control flow in package names	2024-11-06 21:23:24 +03:00
Alexander Stepchenko	bb085c8498	make PKG_VERSION into a dictionary of PKG_VERSIONS	2024-11-06 20:57:26 +03:00
Alexander Stepchenko	dd9866702e	add info.yaml files for k8s images	2024-11-06 20:57:26 +03:00
Alexander Stepchenko	6235bdb955	fix installed package for kubernetes images	2024-11-06 20:57:26 +03:00
Alexander Stepchenko	ad980dbb06	strip whitespace from rendered tag	2024-11-06 19:51:40 +03:00
Alexander Stepchenko	d4f88412bf	add templating for tag and package name in info.yaml	2024-10-23 16:15:16 +03:00
Alexander Stepchenko	0c09627b12	try automatic package version detection	2024-10-23 13:13:53 +03:00