Updates #14

Merged
chris merged 5 commits from testing into release 2024-12-17 22:10:48 -05:00
3 changed files with 14 additions and 39 deletions

View File

@ -88,11 +88,7 @@ jobs:
runs-on: self-hosted runs-on: self-hosted
steps: steps:
- name: Cleanup build images - name: Cleanup build images
run: | run: docker system prune -af
pwd
docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}
docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}
docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}
Cleanup-Docker-Login: Cleanup-Docker-Login:

View File

@ -3,7 +3,7 @@ name: Docker Build Pipeline
on: on:
push: push:
branches: branches:
- gitea-actions - testing
jobs: jobs:
Cleanup-Old-Artifacts: Cleanup-Old-Artifacts:
@ -56,18 +56,18 @@ jobs:
steps: steps:
- name: Build Fedora Image - name: Build Fedora Image
run: | run: |
echo "docker build --no-cache -f build/Containerfile.fedora39 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} ." echo "docker build --no-cache -f build/Containerfile.fedora39 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} ."
docker build --no-cache -f build/Containerfile.fedora39 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} . docker build --no-cache -f build/Containerfile.fedora39 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} .
- name: Build CentOS Image - name: Build CentOS Image
run: | run: |
echo "docker build --no-cache -f build/Containerfile.centos9 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} ." echo "docker build --no-cache -f build/Containerfile.centos9 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} ."
docker build --no-cache -f build/Containerfile.centos9 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} . docker build --no-cache -f build/Containerfile.centos9 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} .
- name: Build Debian Image - name: Build Debian Image
run: | run: |
echo "docker build --no-cache -f build/Containerfile.debian12 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} ." echo "docker build --no-cache -f build/Containerfile.debian12 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} ."
docker build --no-cache -f build/Containerfile.debian12 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} . docker build --no-cache -f build/Containerfile.debian12 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} .
Push-Images: Push-Images:
@ -79,9 +79,9 @@ jobs:
- name: Push Registry Images - name: Push Registry Images
run: | run: |
pwd pwd
docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}
docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}
docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}
Cleanup-Build-Images: Cleanup-Build-Images:
@ -90,9 +90,9 @@ jobs:
- name: Cleanup build images - name: Cleanup build images
run: | run: |
pwd pwd
docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}
docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}
docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}
Cleanup-Docker-Login: Cleanup-Docker-Login:

View File

@ -1,21 +0,0 @@
FROM docker.io/debian:11
LABEL maintainer="Chris Hammer (chris@thezengarden.net)"
RUN rm /etc/localtime \
&& ln -s /usr/share/zoneinfo/US/Eastern /etc/localtime
RUN mkdir -p /root/.ssh
COPY conf/ssh_config /root/.ssh/config
COPY conf/hosts /etc/hosts
COPY python/requirements.txt /tmp/requirements.txt
RUN apt update \
&& apt dist-upgrade -y \
&& apt autoremove --purge -y \
&& apt install -y python3-pip git systemd nodejs \
&& pip install pip --upgrade \
&& pip install -r /tmp/requirements.txt
COPY ansible/ansible-check.yml /tmp/ansible-check.yml
CMD ["/bin/bash"]