Skip to content

Commit 8190b97

Browse files
authored
Merge pull request #145 from essentialkaos/develop
Version 3.4.3+1
2 parents 5c6e198 + 43d27a6 commit 8190b97

File tree

13 files changed

+176
-67
lines changed

13 files changed

+176
-67
lines changed

.docker/entrypoint

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,14 @@ user_id=${LOCAL_USER_ID:-9001}
99
# Create builder user
1010
useradd -s /bin/bash -u "$user_id" -M -d /home/builder builder
1111

12-
# Unlock builder user account
13-
passwd -u builder &> /dev/null
12+
# Unlock account
13+
passwd -d builder &> /dev/null
14+
15+
if [[ $(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5) == "10" ]] ; then
16+
passwd -u builder &> /dev/null
17+
else
18+
passwd -fu builder &> /dev/null
19+
fi
1420

1521
# Generate password for superuser
1622
su_pass=$(pwgen -sB1 18)

.docker/node-entrypoint

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,14 @@ chmod 777 /dev/stdout
1515
# Create builder user
1616
useradd -s /bin/bash -u "$USER_ID" -M -d /home/builder builder
1717

18-
# Unlock user account
19-
passwd -u builder
18+
# Unlock account
19+
passwd -d builder
20+
21+
if [[ $(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5) == "10" ]] ; then
22+
passwd -u builder
23+
else
24+
passwd -fu builder
25+
fi
2026

2127
# Export public key to authorized_keys file
2228
echo "$PUB_KEY" > /home/builder/.ssh/authorized_keys

.docker/ol10.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ RUN <<EOF
2626
dnf -y -q install https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm
2727
sed -i 's/gpgcheck=1/gpgcheck=1\nmodule_hotfixes=1/g' /etc/yum.repos.d/epel.repo
2828
dnf config-manager --set-enabled ol10_codeready_builder
29-
dnf -y -q install sudo make which file
30-
dnf -y -q install rpm-build spec-builddep rpmdevtools sshpass epel-rpm-macros
29+
dnf -y -q install sudo make which file ncurses perl
30+
dnf -y -q install rpm-build spec-builddep rpmdevtools sshpass
3131
dnf -y -q install perfecto pwgen uv
3232
XDG_DATA_HOME=/usr/share uv tool install rpmlint --no-cache --no-progress --force
3333
ln -sf /usr/share/uv/tools/rpmlint/bin/rpmlint /usr/bin/rpmlint

.docker/ol8.docker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN <<EOF
2727
sed -i 's/gpgcheck=1/gpgcheck=1\nmodule_hotfixes=1/g' /etc/yum.repos.d/epel.repo
2828
dnf config-manager --set-enabled ol8_codeready_builder
2929
dnf -y -q remove libevent
30-
dnf -y -q install sudo make which file
30+
dnf -y -q install sudo make which file ncurses perl
3131
dnf -y -q install rpm-build spec-builddep rpmdevtools sshpass
3232
dnf -y -q install perfecto pwgen uv
3333
XDG_DATA_HOME=/usr/share uv tool install rpmlint --no-cache --no-progress --force

.docker/ol9.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ RUN <<EOF
2626
dnf -y -q install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
2727
sed -i 's/gpgcheck=1/gpgcheck=1\nmodule_hotfixes=1/g' /etc/yum.repos.d/epel.repo
2828
dnf config-manager --set-enabled ol9_codeready_builder
29-
dnf -y -q install sudo make which file
30-
dnf -y -q install rpm-build spec-builddep rpmdevtools sshpass epel-rpm-macros
29+
dnf -y -q install sudo make which file ncurses perl
30+
dnf -y -q install rpm-build spec-builddep rpmdevtools sshpass
3131
dnf -y -q install perfecto pwgen uv
3232
XDG_DATA_HOME=/usr/share uv tool install rpmlint --no-cache --no-progress --force
3333
ln -sf /usr/share/uv/tools/rpmlint/bin/rpmlint /usr/bin/rpmlint

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
* @essentialkaos/bash
2+
/.github/workflows/* @essentialkaos/devops

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 55 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: ❗ Bug Report
2+
description: File a bug report
3+
title: "[Bug]: "
4+
labels: ["issue • bug"]
5+
assignees:
6+
- andyone
7+
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: |
12+
> [!IMPORTANT]
13+
> Before you open an issue, search GitHub Issues for a similar bug reports. If so, please add a 👍 reaction to the existing issue.
14+
15+
- type: textarea
16+
attributes:
17+
label: Verbose application info
18+
description: Output of `rpmbuilder -v` command
19+
render: shell
20+
validations:
21+
required: true
22+
23+
- type: dropdown
24+
id: version
25+
attributes:
26+
label: Install tools
27+
description: How did you install this application
28+
options:
29+
- From Sources
30+
- RPM Package
31+
- Prebuilt Binary
32+
default: 0
33+
validations:
34+
required: true
35+
36+
- type: textarea
37+
attributes:
38+
label: Steps to reproduce
39+
description: Short guide on how to reproduce this problem on our site
40+
placeholder: |
41+
1. [First Step]
42+
2. [Second Step]
43+
3. [and so on...]
44+
validations:
45+
required: true
46+
47+
- type: textarea
48+
attributes:
49+
label: Expected behavior
50+
description: What you expected to happen
51+
validations:
52+
required: true
53+
54+
- type: textarea
55+
attributes:
56+
label: Actual behavior
57+
description: What actually happened
58+
validations:
59+
required: true
60+
61+
- type: textarea
62+
attributes:
63+
label: Additional info
64+
description: Include gist of relevant config, logs, etc.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
blank_issues_enabled: false
2+
3+
contact_links:
4+
- name: Security Policies and Procedures
5+
url: https://github.com/essentialkaos/.github/blob/master/SECURITY.md
6+
about: Security procedures and general policies for all ESSENTIAL KAOS projects.
7+
8+
- name: Contributing Guidelines
9+
url: https://github.com/essentialkaos/contributing-guidelines/blob/master/CONTRIBUTING.md
10+
about: Contributing Guidelines for all ESSENTIAL KAOS projects
11+
12+
- name: Go Version Support Policy
13+
url: https://github.com/essentialkaos/.github/blob/master/GO-VERSION-SUPPORT.md
14+
about: Information about supported Go versions
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: ❓ Question
2+
description: Question about application, configuration or code
3+
title: "[Question]: "
4+
labels: ["issue • question"]
5+
assignees:
6+
- andyone
7+
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: |
12+
> [!IMPORTANT]
13+
> Before you open an issue, search GitHub Issues for a similar question. If so, please add a 👍 reaction to the existing issue.
14+
15+
- type: textarea
16+
attributes:
17+
label: Question
18+
description: Detailed question
19+
validations:
20+
required: true
21+
22+
- type: textarea
23+
attributes:
24+
label: Related version application info
25+
description: Output of `rpmbuilder -v` command
26+
render: shell

0 commit comments

Comments
 (0)