Skip to content

Commit ba7cc46

Browse files
committed
6.0.0
1 parent 6e22457 commit ba7cc46

275 files changed

Lines changed: 9825 additions & 5949 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Build Docker 6.0.0 image
2+
3+
on:
4+
push:
5+
branches: [ ui ]
6+
7+
jobs:
8+
push_to_registry:
9+
name: Push Docker image to Docker Hub
10+
runs-on: ubuntu-latest
11+
permissions:
12+
contents: read
13+
steps:
14+
- name: Check out the repo
15+
uses: actions/checkout@v6
16+
with:
17+
ref: 'ui'
18+
19+
- name: Retrieve Repomanager version
20+
run: |
21+
echo "VERSION=$(cat ${GITHUB_WORKSPACE}/www/version)" >> $GITHUB_ENV
22+
echo "Version: ${{ env.VERSION }}"
23+
24+
- name: Set up QEMU
25+
uses: docker/setup-qemu-action@v3
26+
27+
- name: Set up Docker Buildx
28+
uses: docker/setup-buildx-action@v3
29+
30+
- name: Log in to the container registry
31+
uses: docker/login-action@v3
32+
with:
33+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
34+
password: ${{ secrets.DOCKER_HUB_TOKEN }}
35+
36+
# Build the images
37+
- name: Build and push docker
38+
uses: docker/build-push-action@v6
39+
with:
40+
file: Dockerfile
41+
push: true
42+
tags: lbr38/repomanager:6.0.0-beta
43+
platforms: linux/amd64,linux/arm64,linux/arm/v7
44+
cache-from: type=gha
45+
cache-to: type=gha,mode=max

.github/workflows/test-database-update.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
name: Database update tests
1+
# TODO debug
2+
# Crash en boucle - à corriger une fois 6.0.0 mergé dans devel
3+
# name: Database update tests
24

35
on:
46
push:
@@ -91,7 +93,9 @@ jobs:
9193
9294
cd ${GITHUB_WORKSPACE}
9395
94-
sed -i 's/branch:.*/branch: devel/g' docker-compose.yml
96+
# TODO debug
97+
# sed -i 's/branch:.*/branch: devel/g' docker-compose.yml
98+
sed -i 's/branch:.*/branch: ui/g' docker-compose.yml
9599
sed -i 's/FQDN:.*/FQDN: repomanager.test.com/g' docker-compose.yml
96100
97101
docker-compose -f docker-compose.yml up -d

CLAUDE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## Approach
2+
- Read existing files before writing. Don't re-read unless changed.
3+
- Thorough in reasoning, concise in output.
4+
- Skip files over 100KB unless required.
5+
- No sycophantic openers or closing fluff.
6+
- No emojis or em-dashes.
7+
- Do not guess APIs, versions, flags, commit SHAs, or package names. Verify by reading code or docs before asserting.

docker-compose-dev-6.0.0.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
# TODO debug
3+
# For my dev environment only
4+
version: "3"
5+
services:
6+
repomanager:
7+
container_name: repomanager-dev-600
8+
image: repomanager
9+
network_mode: host
10+
environment:
11+
FQDN: repomanager-dev-600.localhost
12+
MAX_UPLOAD_SIZE: 64M
13+
NGINX_LISTEN_PORT: 7777
14+
PUID: 1000
15+
PGID: 1000
16+
build:
17+
context: .
18+
dockerfile: Dockerfile
19+
args:
20+
branch: ui
21+
restart: unless-stopped
22+
volumes:
23+
- /etc/localtime:/etc/localtime:ro
24+
- /var/lib/docker/volumes/repomanager-dev-600-logs:/var/log/nginx
25+
- /var/lib/docker/volumes/repomanager-dev-600-www:/var/www/repomanager
26+
- /var/lib/docker/volumes/repomanager-dev-600-data:/var/lib/repomanager
27+
- /var/lib/docker/volumes/repomanager-dev-600-repo:/home/repo

docker/config/nginx/repomanager.conf

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,12 @@ server {
121121
access_log off;
122122
}
123123

124-
location /repo {
125-
alias $REPOS_DIR;
124+
# Matches /repo/ and /repo/xxx but not /repository
125+
location ^~ /repo/ {
126+
# Final slash is important, otherwise it could break the download of packages
127+
alias $REPOS_DIR/;
128+
129+
# Uncomment the following lines to enable directory listing (autoindex) for repositories
126130
# autoindex on;
127131
# autoindex_exact_size off;
128132
# autoindex_localtime on;

www/bin/repomanager

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,10 @@ echo '
9292
| | \| ___/| |_> ) (_) ) Y Y \/ __ \| | \/ __ \/ /_/ > ___/| | \/
9393
|__| \___ > __/ \____/|__|_| (____ /___| (____ |___ / \___ >__|
9494
\/|__| \/ \/ \/ \/_____/ \/
95-
9695
'
9796

97+
echo -e "Version $(cat $WWW_DIR/version)\n"
98+
9899
while [ $# -ge 1 ];do
99100
case "$1" in
100101
--help|-help|-h)

www/config/properties.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@
1010
'version_file_url' => 'https://raw.githubusercontent.com/lbr38/repomanager/main/www/version',
1111

1212
// RPM release versions default values
13-
'rpm_releasevers' => ['10' => 'RHEL 10 and derivatives', '9' => 'RHEL 9 and derivatives', '8' => 'RHEL 8 and derivatives', '7' => 'RHEL 7 and derivatives'],
13+
'rpm_releasevers' => [
14+
'10' => 'RHEL 10 and derivatives',
15+
'9' => 'RHEL 9 and derivatives',
16+
'8' => 'RHEL 8 and derivatives',
17+
'7' => 'RHEL 7 and derivatives'
18+
],
1419

1520
// DEB distributions default values
1621
'deb_distributions' => [

www/config/tasks/create.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
'env',
1919
'group',
2020
'description',
21+
'tags',
2122
'advanced-params' // Advanced params include package include/exclude and metadata custom fields, it is optional
2223
],
2324

www/config/tasks/duplicate.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
'env',
2020
'group',
2121
'description',
22+
'tags'
2223
],
2324

2425
// Conditional params must be compared with form values

www/config/tasks/env.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,10 @@
2424
// Form configuration
2525
$formConfig = [
2626
// Allowed schedule types for this task
27-
'allowed-schedule-types' => ['unique']
27+
// Recurring is only allowed when the task targets a dynamic set of repositories,
28+
// as pointing an environment on a fixed snapshot repeatedly makes no sense
29+
'allowed-schedule-types' => ['unique'],
30+
31+
// This task can target a dynamic set of repositories (all latest snapshots matching filters)
32+
'allow-dynamic-target' => true
2833
];

0 commit comments

Comments
 (0)