Testing secrets w/pull requests... try again... #2

Merged
chris merged 4 commits from testing into release 2023-12-08 15:58:46 -05:00
2 changed files with 23 additions and 18 deletions

View File

@ -3,7 +3,6 @@ kind: pipeline
type: exec type: exec
name: ansible_dev_centos_stream9 name: ansible_dev_centos_stream9
trigger: trigger:
branch: branch:
exclude: exclude:
@ -37,29 +36,35 @@ steps:
- name: docker_build - name: docker_build
environment: environment:
REGISTRY : gitea.thezengarden.net REGISTRY :
BUILD_PREFIX : podman/ansible-dev from_secret: build_registry
BUILD_NAME : centos9 BUILD_PREFIX :
BUILD_TAG : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER" from_secret: build_prefix
BUILD_NAME :
from_secret: build_name_centos9
commands: commands:
- echo "docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$BUILD_TAG ." - echo "docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
- docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$BUILD_TAG . - docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
- name: docker_push - name: docker_push
environment: environment:
REGISTRY : gitea.thezengarden.net REGISTRY :
BUILD_PREFIX : podman/ansible-dev from_secret: build_registry
BUILD_NAME : centos9 BUILD_PREFIX :
BUILD_TAG : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER" from_secret: build_prefix
BUILD_NAME :
from_secret: build_name_centos9
commands: commands:
- docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$BUILD_TAG - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER
- docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
- name: docker_images - name: docker_image_list
environment: environment:
REGISTRY : gitea.thezengarden.net REGISTRY :
BUILD_PREFIX : podman/ansible-dev from_secret: build_registry
BUILD_NAME : centos9 BUILD_PREFIX :
BUILD_TAG : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER" from_secret: build_prefix
BUILD_NAME :
from_secret: build_name_centos9
commands: commands:
- docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"

View File

@ -8,7 +8,7 @@ RUN mkdir -p /root/.ssh
COPY conf/ssh_config /root/.ssh/config COPY conf/ssh_config /root/.ssh/config
COPY conf/hosts /etc/hosts COPY conf/hosts /etc/hosts
COPY conf/dnf.conf /etc/dnf/dnf.conf COPY conf/dnf.conf /etc/dnf/dnf.conf
# COPY python/requirements.txt /tmp/requirements.txt COPY python/requirements.txt /tmp/requirements.txt
# RUN dnf install -y python3-pip git ansible-core python3-ansible-lint # RUN dnf install -y python3-pip git ansible-core python3-ansible-lint
RUN dnf update -y \ RUN dnf update -y \