diff --git a/.github/workflows/base-image-rebuild.yml b/.github/workflows/base-image-rebuild.yml index c798682..2d2b766 100644 --- a/.github/workflows/base-image-rebuild.yml +++ b/.github/workflows/base-image-rebuild.yml @@ -8,7 +8,6 @@ on: branches: - main paths: - - containers/Containerfile.fedora - containers/Containerfile.c9s jobs: @@ -21,8 +20,6 @@ jobs: strategy: matrix: include: - - containerfile: containers/Containerfile.fedora - tags: "fedora" - containerfile: containers/Containerfile.c9s tags: "c9s latest" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3671ede..c88775a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ # HOWTO: https://pre-commit.com/#usage -# pip3 install pre-commit +# dnf install pre-commit # pre-commit install repos: @@ -20,26 +20,20 @@ repos: args: - --allow-missing-credentials - repo: https://github.com/ansible/ansible-lint.git - rev: v6.20.3 + rev: v6.22.1 hooks: - id: ansible-lint files: \.(yaml|yml)$ - repo: https://github.com/psf/black - rev: 23.9.1 + rev: 23.12.0 hooks: - id: black - repo: https://github.com/shellcheck-py/shellcheck-py rev: v0.9.0.6 hooks: - id: shellcheck - - repo: https://github.com/gitleaks/gitleaks - rev: v8.18.0 - hooks: - - id: gitleaks - # The hook runs 'gitleaks protect --staged' which parses output of - # 'git diff --staged', i.e. always passes in pre-push/manual stage. - stages: [commit] ci: # The project is too huge for pre-commit.ci skip: [ansible-lint] + autoupdate_schedule: monthly diff --git a/containers/Containerfile.c9s b/containers/Containerfile.c9s index 9eb206d..b1c4b57 100644 --- a/containers/Containerfile.c9s +++ b/containers/Containerfile.c9s @@ -6,9 +6,9 @@ FROM quay.io/centos/centos:stream9 ENV ANSIBLE_PYTHON_INTERPRETER=/usr/bin/python3 \ ANSIBLE_STDOUT_CALLBACK=debug -RUN dnf install -y epel-release 'dnf-command(config-manager)' && \ - dnf config-manager --set-enabled crb && \ - dnf module enable postgresql -y && \ - dnf update -y && \ - dnf install -y ansible python3-pip && \ +RUN dnf -y install epel-release && \ + crb enable && \ + dnf -y module enable postgresql:15 && \ + dnf -y upgrade && \ + dnf -y install ansible python3-pip && \ dnf clean all diff --git a/containers/Containerfile.fedora b/containers/Containerfile.fedora deleted file mode 100644 index ec6164c..0000000 --- a/containers/Containerfile.fedora +++ /dev/null @@ -1,13 +0,0 @@ -# Be aware that this image is used for all stages, so if a dependency is removed be sure that it is -# not required in anywhere - -FROM fedora:37 - -ENV ANSIBLE_PYTHON_INTERPRETER=/usr/bin/python3 \ - ANSIBLE_STDOUT_CALLBACK=debug - -RUN dnf update -y \ - && dnf install -y \ - ansible \ - python3-pip \ - && dnf clean all