obirvalger/image-forge
1
0
Fork 0
forked from alt/image-forge
Code Pull Requests Activity

fix run new build process

Browse Source
This commit is contained in:
Nadezhda Fedorova 2024-11-11 17:32:27 +03:00
parent a34788f701
commit 34bdff6755
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/wf_full_sis.yaml
View File

@ -55,7 +55,7 @@ jobs:
id: build-script id: build-script
run: | run: |
build_args="-b $BR -o $ORG --skip-images alt/distroless-devel --arches amd64 386 arm64 loong64" 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 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
echo "build.py $build_args" echo "build.py $build_args"
${{ gitea.workspace }}/build.py $build_args ${{ gitea.workspace }}/build.py $build_args
env: env:

4
.gitea/workflows/wf_single.yaml
View File

@ -48,7 +48,7 @@ jobs:
echo "podman login ${{ env.URL }}" 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: env:
P_USER: ${{ secrets.PODMAN_USER }} P_USER: ${{ secrets.PODMAN_USER }}'
P_PASS: ${{ secrets.PODMAN_PASS }} P_PASS: ${{ secrets.PODMAN_PASS }}
- name: Check files in the repository - name: Check files in the repository
run: | run: |
@ -78,7 +78,7 @@ jobs:
- name: Run building script - name: Run building script
id: build-script id: build-script
run: | run: |
if [[ "$IM" == *"k8s"* ]]; then k8sarg="--overwrite-organization $ORG-$BR --package-versions '{\"$IM\":\"$VER\"}'"; else k8sarg=""; fi 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 [[ "$BR" = "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64"; else arches="--arches amd64 386 arm64"; fi
echo "build.py -i $IM -b $BR" 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 $arches $k8sarg