Compare commits

...

19 Commits

Author SHA1 Message Date
github-actions[bot]
3b54b4c513 Update CHANGELOG.md 2025-01-15 14:09:01 +00:00
CanbiZ
5da06e75e7
Update update_json_date.yml 2025-01-15 15:08:44 +01:00
Dominik Siebel
2aed45fa61
fix: actually add the given root SSH key to the container (#1502) 2025-01-15 15:01:24 +01:00
CanbiZ
7614034784
Update update_json_date.yml
Some checks are pending
Shellcheck / Shellcheck (push) Waiting to run
Create Changelog Pull Request / update-changelog-pull-request (push) Waiting to run
2025-01-15 11:36:10 +01:00
CanbiZ
0f06725fdc
Update update_json_date.yml 2025-01-15 11:34:20 +01:00
CanbiZ
5c16955a8e
Update update_json_date.yml 2025-01-15 11:32:11 +01:00
CanbiZ
2c8aab24d0 Merge branch 'main' of https://github.com/community-scripts/ProxmoxVE 2025-01-15 11:31:55 +01:00
CanbiZ
9cc07cc6e1 bak 2025-01-15 11:31:48 +01:00
CanbiZ
047667c428
Update update_json_date.yml 2025-01-15 11:27:53 +01:00
CanbiZ
147ba0e78d backup 2 files 2025-01-15 11:26:01 +01:00
CanbiZ
d3b0becfe6 Switch from workflows to scripts folder 2025-01-15 11:25:31 +01:00
CanbiZ
d20d0428dc
Rename update_json_date.sh1 to update_json_date.sh 2025-01-15 11:21:51 +01:00
CanbiZ
0368ce36d1
Rename update_json_date.sh to update_json_date.yml 2025-01-15 11:21:38 +01:00
CanbiZ
757b5bd267
Create update_json_date.sh1 2025-01-15 11:21:26 +01:00
CanbiZ
4d0632fea0
Create update_json_date.sh 2025-01-15 11:19:32 +01:00
CanbiZ
69288b197f
Update check_and_update_json_date.yml 2025-01-15 11:13:55 +01:00
CanbiZ
12a61a1d71
Update check_and_update_json_date.yml 2025-01-15 11:12:18 +01:00
CanbiZ
d186557488
Update check_and_update_json_date.yml 2025-01-15 11:09:31 +01:00
community-scripts-pr-app[bot]
db6390f791
Update CHANGELOG.md (#1498) 2025-01-15 11:08:48 +01:00
11 changed files with 173 additions and 34 deletions

View File

@ -34,8 +34,8 @@ jobs:
# Step 4: Run the generate-app-headers.sh script to update .app-headers # Step 4: Run the generate-app-headers.sh script to update .app-headers
- name: Run generate-app-headers.sh to update .app-headers - name: Run generate-app-headers.sh to update .app-headers
run: | run: |
chmod +x .github/workflows/generate-app-headers.sh chmod +x .github/workflows/scripts/generate-app-headers.sh
.github/workflows/generate-app-headers.sh .github/workflows/scripts/generate-app-headers.sh
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@ -0,0 +1,60 @@
name: Update date_created in JSON files
on:
# Dieser Trigger wird für das Öffnen von PRs sowie für das Aktualisieren von offenen PRs verwendet
pull_request:
types: [opened, synchronize]
schedule:
# Dieser Trigger wird 4x am Tag ausgelöst, um sicherzustellen, dass das Datum aktualisiert wird
- cron: "0 0,6,12,18 * * *" # Führt alle 6 Stunden aus
workflow_dispatch: # Manuelle Ausführung des Workflows möglich
jobs:
update-date:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install yq
run: |
sudo apt-get update
sudo apt-get install -y yq
- name: Set the current date
id: set_date
run: echo "TODAY=$(date -u +%Y-%m-%d)" >> $GITHUB_ENV
- name: Check for changes in PR
run: |
# Hole den PR-Branch
PR_BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
git fetch origin $PR_BRANCH
# Liste alle JSON-Dateien im PR auf, die geändert wurden
CHANGED_JSON_FILES=$(git diff --name-only origin/main...$PR_BRANCH | grep '.json')
if [ -z "$CHANGED_JSON_FILES" ]; then
echo "No JSON files changed in this PR."
exit 0
fi
# Gehe alle geänderten JSON-Dateien durch und aktualisiere das Datum
for file in $CHANGED_JSON_FILES; do
echo "Updating date_created in $file"
# Setze das aktuelle Datum
yq eval ".date_created = \"${{ env.TODAY }}\"" -i "$file"
git add "$file"
done
- name: Commit and push changes
run: |
# Prüfe, ob es Änderungen gibt und committe sie
git config user.name "json-updater-bot"
git config user.email "github-actions[bot]@users.noreply.github.com"
git commit -m "Update date_created to ${{ env.TODAY }}" || echo "No changes to commit"
# Push zurück in den PR-Branch
git push origin $PR_BRANCH

View File

@ -1,32 +0,0 @@
name: Update Date Created in PR
on:
pull_request:
paths:
- '*.json'
types: [opened, synchronize]
jobs:
update-date:
runs-on: ubuntu-latest
steps:
- name: Checkout PR branch
uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
- name: Install yq
run: |
curl -sSL https://github.com/mikefarah/yq/releases/download/v4.18.1/yq_linux_amd64 -o /usr/local/bin/yq
chmod +x /usr/local/bin/yq
- name: Update date_created in JSON
run: |
TODAY=$(date -u +%Y-%m-%d)
yq e '.date_created = strftime("%Y-%m-%d")' -i your_file.json
- name: Commit changes if necessary
run: |
git status
git diff --quiet || (git commit -m "Update date_created to $TODAY" && git push origin ${{ github.head_ref }})

View File

@ -0,0 +1,23 @@
#!/usr/bin/env bash
# Verzeichnis, das die JSON-Dateien enthält
json_dir="./json/*.json"
current_date=$(date +"%Y-%m-%d")
for json_file in $json_dir; do
if [[ -f "$json_file" ]]; then
current_json_date=$(jq -r '.date_created' "$json_file")
if [[ "$current_json_date" != "$current_date" ]]; then
echo "Updating $json_file with date $current_date"
jq --arg date "$current_date" '.date_created = $date' "$json_file" > temp.json && mv temp.json "$json_file"
git add "$json_file"
git commit -m "Update date_created to $current_date in $json_file"
else
echo "Date in $json_file is already up to date."
fi
fi
done
git push origin HEAD

68
.github/workflows/update_json_date.yml vendored Normal file
View File

@ -0,0 +1,68 @@
name: Update JSON Date in PR
on:
pull_request:
branches:
- main
types:
- opened
- synchronize
- reopened
jobs:
update_json:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v4
- name: Configure Git user
run: |
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
- name: Get list of changed files in PR
id: files
uses: actions/github-script@v7
with:
script: |
const prNumber = context.payload.pull_request.number;
const prFiles = await github.rest.pulls.listFiles({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: prNumber,
});
// Filter for JSON files only
const changedJsonFiles = prFiles.data
.filter(file => file.filename.endsWith('.json'))
.map(file => file.filename);
core.setOutput('changed_files', changedJsonFiles.join('\n'));
console.log('Changed JSON files:', changedJsonFiles);
- name: Update dates in changed JSON files
run: |
changed_files="${{ steps.files.outputs.changed_files }}"
if [[ -z "$changed_files" ]]; then
echo "No JSON files changed in this PR. Exiting."
exit 0
fi
for file in $changed_files; do
echo "Updating $file with current date."
# Your logic to update the file
jq '.date_created = "'"$(date +%Y-%m-%d)"'"' "$file" > tmp.$$.json && mv tmp.$$.json "$file"
done
- name: Commit changes if updated
run: |
git add *.json
git diff --cached --quiet || git commit -m "Update JSON dates"
- name: Push changes
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git push

View File

@ -16,6 +16,18 @@ All LXC instances created using this repository come pre-installed with Midnight
> [!IMPORTANT] > [!IMPORTANT]
Do not break established syntax in this file, as it is automatically updated by a Github Workflow Do not break established syntax in this file, as it is automatically updated by a Github Workflow
## 2025-01-15
### Changed
### 🚀 Updated Scripts
- Fix: Add FFMPEG for OpenWebUI [@MickLesk](https://github.com/MickLesk) ([#1497](https://github.com/community-scripts/ProxmoxVE/pull/1497))
### 🧰 Maintenance
- [core] build.func&install.func: Fix ssh keynot added error [@dsiebel](https://github.com/dsiebel) ([#1502](https://github.com/community-scripts/ProxmoxVE/pull/1502))
## 2025-01-14 ## 2025-01-14
### Changed ### Changed

View File

@ -827,6 +827,7 @@ build_container() {
export PASSWORD="$PW" export PASSWORD="$PW"
export VERBOSE="$VERB" export VERBOSE="$VERB"
export SSH_ROOT="${SSH}" export SSH_ROOT="${SSH}"
export SSH_AUTHORIZED_KEY
export CTID="$CT_ID" export CTID="$CT_ID"
export CTTYPE="$CT_TYPE" export CTTYPE="$CT_TYPE"
export PCT_OSTYPE="$var_os" export PCT_OSTYPE="$var_os"

View File

@ -255,4 +255,11 @@ EOF
fi fi
echo "bash -c \"\$(wget -qLO - https://github.com/community-scripts/ProxmoxVE/raw/main/ct/${app}.sh)\"" >/usr/bin/update echo "bash -c \"\$(wget -qLO - https://github.com/community-scripts/ProxmoxVE/raw/main/ct/${app}.sh)\"" >/usr/bin/update
chmod +x /usr/bin/update chmod +x /usr/bin/update
if [[ -n "${SSH_AUTHORIZED_KEY}" ]]; then
mkdir -p /root/.ssh
echo "${SSH_AUTHORIZED_KEY}" > /root/.ssh/authorized_keys
chmod 700 /root/.ssh
chmod 600 /root/.ssh/authorized_keys
fi
} }