Skip to content

Commit ffd20ad

Browse files
fix: remove maven-group, add docker-proxy (#120)
1 parent 1cdf642 commit ffd20ad

File tree

12 files changed

+39
-39
lines changed

12 files changed

+39
-39
lines changed

src/main/java/com/artipie/front/ui/repository/RepositoryTemplate.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ public final class RepositoryTemplate {
3131
/**
3232
* Pre-defined template names.
3333
*/
34-
private static final List<String> PREDEFINED = List.of("maven-group", "maven-proxy");
34+
private static final List<String> PREDEFINED = List.of(
35+
"maven-proxy", "docker-proxy", "file-proxy", "npm-proxy", "php-proxy", "pypi-proxy"
36+
);
3537

3638
/**
3739
* Template engine.

src/main/resources/html/repository/create

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function formSubmit() {
8989
<option value="npm-proxy">NPM proxy (mirror)</option>
9090
<option value="pypi-proxy">Python proxy (mirror)</option>
9191
<option value="php-proxy">Php proxy (remote)</option>
92-
<option value="maven-group">Maven group (virtual)</option>
92+
<option value="docker-proxy">Docker proxy (remote)</option>
9393
</select>
9494
<fieldset>
9595
<textarea id="new-repo-config" name="config" class="monospace" type="textarea" style="width: 100%; height: 12em;"></textarea>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Artipie Docker Proxy repository redirects all pull requests to specified remote registries. Storage is optional here:
2+
if not added, no images will be cached and <code>push</code> to the repository is not allowed.
3+
If storage is set, remote images are cached and <code>push</code> works as usual.

src/main/resources/info/maven-group.info.html

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
repo:
22
type: {{type}}
33
storage: default
4-
permissions:
5-
{{user}}:
6-
- upload
7-
- download
8-
"*":
9-
- download
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
repo:
2+
type: docker-proxy
3+
storage: default
4+
# proxy for Docker registry
5+
remotes:
6+
- url: registry-1.docker.io
7+
- url: mcr.microsoft.com
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
repo:
2+
type: file-proxy
3+
storage: default
4+
# proxy some general file storage
5+
remotes:
6+
- uri: https://some-general-storage.com

src/main/resources/template/maven-group.template.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
repo:
22
type: maven-proxy
33
storage: default
4-
# proxy for Apache Maven central
4+
# proxy for Apache Maven central (several remotes supported)
55
remotes:
66
- uri: https://repo.maven.apache.org/maven2
7-
cache:
8-
storage: default
9-
permissions:
10-
{{user}}:
11-
- upload
12-
- download
13-
"*":
14-
- download
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
repo:
2+
type: npm-proxy
3+
storage: default
4+
# proxy for NPM public registry
5+
remotes:
6+
- uri: https://registry.npmjs.org

0 commit comments

Comments
 (0)