diff --git a/.drone.yml b/.drone.yml index 80c44e2..4996e04 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,6 @@ kind: pipeline type: exec name: ansible_dev_centos_stream9 - trigger: branch: exclude: @@ -37,29 +36,35 @@ steps: - name: docker_build environment: - REGISTRY : gitea.thezengarden.net - BUILD_PREFIX : podman/ansible-dev - BUILD_NAME : centos9 - BUILD_TAG : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER" + REGISTRY : + from_secret: build_registry + BUILD_PREFIX : + from_secret: build_prefix + BUILD_NAME : + from_secret: build_name_centos9 commands: - - echo "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:$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:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER . - name: docker_push environment: - REGISTRY : gitea.thezengarden.net - BUILD_PREFIX : podman/ansible-dev - BUILD_NAME : centos9 - BUILD_TAG : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER" + REGISTRY : + from_secret: build_registry + BUILD_PREFIX : + from_secret: build_prefix + BUILD_NAME : + from_secret: build_name_centos9 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" - - name: docker_images + - name: docker_image_list environment: - REGISTRY : gitea.thezengarden.net - BUILD_PREFIX : podman/ansible-dev - BUILD_NAME : centos9 - BUILD_TAG : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER" + REGISTRY : + from_secret: build_registry + BUILD_PREFIX : + from_secret: build_prefix + BUILD_NAME : + from_secret: build_name_centos9 commands: - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME" diff --git a/build/Containerfile.centos-stream9 b/build/Containerfile.centos-stream9 index ae250b9..a7e840e 100644 --- a/build/Containerfile.centos-stream9 +++ b/build/Containerfile.centos-stream9 @@ -8,7 +8,7 @@ RUN mkdir -p /root/.ssh COPY conf/ssh_config /root/.ssh/config COPY conf/hosts /etc/hosts 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 update -y \