Skip to content

Commit

Permalink
Explicitly enable postgresql:15 module (#545)
Browse files Browse the repository at this point in the history
Fixes:
```
Argument 'postgresql' matches 2 streams ('15', '16') of module 'postgresql', but none of the streams are enabled or default
Unable to resolve argument postgresql
```

see
https://github.com/packit/deployment/actions/workflows/base-image-rebuild.yml
  • Loading branch information
jpopelka authored Dec 12, 2023
2 parents 649abc6 + addb92c commit 6616a83
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 31 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/base-image-rebuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
branches:
- main
paths:
- containers/Containerfile.fedora
- containers/Containerfile.c9s

jobs:
Expand All @@ -21,8 +20,6 @@ jobs:
strategy:
matrix:
include:
- containerfile: containers/Containerfile.fedora
tags: "fedora"
- containerfile: containers/Containerfile.c9s
tags: "c9s latest"

Expand Down
14 changes: 4 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# HOWTO: https://pre-commit.com/#usage
# pip3 install pre-commit
# dnf install pre-commit
# pre-commit install

repos:
Expand All @@ -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
10 changes: 5 additions & 5 deletions containers/Containerfile.c9s
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 0 additions & 13 deletions containers/Containerfile.fedora

This file was deleted.

0 comments on commit 6616a83

Please sign in to comment.