Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pre-commit.ci] pre-commit autoupdate #47

Merged
merged 3 commits into from
Oct 9, 2024
Merged

[pre-commit.ci] pre-commit autoupdate #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e9beac
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Oct 7, 2024
f5dfc0b
Replace docker-compose with docker compose
atodorov Oct 9, 2024
3ab1a3d
CentOS Stream 8 mirror infrastructure is no more. Use Vault!
atodorov Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Save docker logs
if: always()
run: |
docker-compose logs > docker-compose.log
docker compose logs > docker-compose.log

- name: Upload logs
uses: actions/upload-artifact@v4
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: end-of-file-fixer
- id: mixed-line-ending
args: [--fix=lf]
- id: trailing-whitespace
- repo: https://github.com/asottile/reorder-python-imports
rev: v3.12.0
rev: v3.13.0
hooks:
- id: reorder-python-imports
language_version: python3

- repo: https://github.com/psf/black
rev: 24.4.2
rev: 24.10.0
hooks:
- id: black
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build-services:

.PHONY: run-services
run-services:
docker-compose up -d
docker compose up -d
docker cp krb5_kiwitcms_org:/tmp/application.keytab .
docker cp ./application.keytab web_kiwitcms_org:/Kiwi/application.keytab
rm ./application.keytab
Expand Down
4 changes: 4 additions & 0 deletions tests/Dockerfile.kerberos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ EXPOSE 88
COPY ./krb5.conf /etc/
COPY ./ktutil.instructions /tmp/

# Mirrorlist URLs are dead, use the Vault!
COPY ./vault.repo /etc/yum.repos.d/
RUN rm -rf /etc/yum.repos.d/CentOS-Stream-*.repo

RUN dnf -y --setopt=tsflags=nodocs install krb5-server krb5-workstation && \
sed -i "s/EXAMPLE.COM/KIWITCMS.ORG/g" /var/kerberos/krb5kdc/kdc.conf && \
sed -i "s/@EXAMPLE.COM//" /var/kerberos/krb5kdc/kadm5.acl && \
Expand Down
13 changes: 13 additions & 0 deletions tests/vault.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[vault-baseos]
name=CentOS Stream $releasever - BaseOS
baseurl=https://vault.centos.org/$stream/BaseOS/$basearch/os/
gpgcheck=1
enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial

[vault-appstream]
name=CentOS Stream $releasever - AppStream
baseurl=https://vault.centos.org/$stream/AppStream/$basearch/os/
gpgcheck=1
enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial