diff --git a/.ci/openshift-ci/build/Dockerfile b/.ci/openshift-ci/build/Dockerfile index 6ab46b4709..c32be4332c 100644 --- a/.ci/openshift-ci/build/Dockerfile +++ b/.ci/openshift-ci/build/Dockerfile @@ -67,7 +67,7 @@ RUN chmod g+rwX /usr/local/bin/entrypoint.sh /usr/local/bin/rhel.entrypoint.sh COPY --from=builder /che-plugin-registry/README.md /che-plugin-registry/.htaccess /var/www/html/ COPY --from=builder /che-plugin-registry/output/v3 /var/www/html/v3 COPY --from=builder /che-plugin-registry/v3/plugins/.htaccess /var/www/html/v3/plugins/ -COPY --from=builder /che-plugin-registry/v3/images/eclipse-che-logo.png /var/www/html/v3/images/ +COPY --from=builder /che-plugin-registry/v3/images/default.png /var/www/html/v3/images/ ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] CMD ["/usr/local/bin/rhel.entrypoint.sh"] diff --git a/.ci/openshift-ci/build/alpine.Dockerfile b/.ci/openshift-ci/build/alpine.Dockerfile index 8c22e11f98..d19009bd13 100644 --- a/.ci/openshift-ci/build/alpine.Dockerfile +++ b/.ci/openshift-ci/build/alpine.Dockerfile @@ -49,7 +49,7 @@ RUN cp /che-plugin-registry/.ci/openshift-ci/build/entrypoint.sh /usr/bin/ && \ cp /che-plugin-registry/.htaccess /usr/local/apache2/htdocs/ && \ cp -r /che-plugin-registry/output/v3 /usr/local/apache2/htdocs/v3 && \ cp /che-plugin-registry/v3/plugins/.htaccess /usr/local/apache2/htdocs/v3/plugins/ && \ - cp /che-plugin-registry/v3/images/eclipse-che-logo.png /usr/local/apache2/htdocs/v3/images/ && \ + cp /che-plugin-registry/v3/images/default.png /usr/local/apache2/htdocs/v3/images/ && \ rm -rf /che-plugin-registry ENTRYPOINT ["/usr/bin/entrypoint.sh"] diff --git a/build/dockerfiles/Dockerfile b/build/dockerfiles/Dockerfile index 88e884b557..273d411a7d 100644 --- a/build/dockerfiles/Dockerfile +++ b/build/dockerfiles/Dockerfile @@ -23,7 +23,7 @@ COPY ./build/dockerfiles/entrypoint.sh /usr/bin/ COPY README.md .htaccess /usr/local/apache2/htdocs/ COPY output/v3 /usr/local/apache2/htdocs/v3 COPY v3/plugins/.htaccess /usr/local/apache2/htdocs/v3/plugins/ -COPY v3/images/eclipse-che-logo.png /usr/local/apache2/htdocs/v3/images/ +COPY v3/images/default.png /usr/local/apache2/htdocs/v3/images/ RUN chmod -R g+rwX /usr/local/apache2 ENTRYPOINT ["/usr/bin/entrypoint.sh"] CMD ["httpd-foreground"] diff --git a/build/dockerfiles/rhel.Dockerfile b/build/dockerfiles/rhel.Dockerfile index 8422c0000d..c28801c866 100644 --- a/build/dockerfiles/rhel.Dockerfile +++ b/build/dockerfiles/rhel.Dockerfile @@ -38,7 +38,7 @@ RUN chmod g+rwX /usr/local/bin/entrypoint.sh /usr/local/bin/rhel.entrypoint.sh COPY README.md .htaccess /var/www/html/ COPY output/v3 /var/www/html/v3 COPY v3/plugins/.htaccess /var/www/html/v3/plugins/ -COPY v3/images/eclipse-che-logo.png /var/www/html/v3/images/ +COPY v3/images/default.png /var/www/html/v3/images/ ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] CMD ["/usr/local/bin/rhel.entrypoint.sh"] diff --git a/tools/build/src/che-theia-plugin/che-theia-plugins-yaml-writer.ts b/tools/build/src/che-theia-plugin/che-theia-plugins-yaml-writer.ts index 426d8ec3ad..523f9bb433 100644 --- a/tools/build/src/che-theia-plugin/che-theia-plugins-yaml-writer.ts +++ b/tools/build/src/che-theia-plugin/che-theia-plugins-yaml-writer.ts @@ -26,7 +26,12 @@ export class CheTheiaPluginsYamlWriter { @named('EMBED_VSIX') private embedVsix: boolean; - public static readonly DEFAULT_ICON = '/v3/images/eclipse-che-logo.png'; + // Path relative to plugin registry ROOT + // https://plugin-registry-eclipse-che.apps-crc.testing/v3 + // + // It must work also for single root deployments + // https://che-eclipse-che.apps-crc.testing/plugin-registry/v3 + public static readonly DEFAULT_ICON = '/images/default.png'; convertIdToPublisherAndName(id: string): [string, string] { const values = id.split('/'); @@ -53,7 +58,7 @@ export class CheTheiaPluginsYamlWriter { const fileExtensionIcon = path.extname(path.basename(iconFile)).toLowerCase(); const destIconFileName = `${data.metadata.publisher}-${data.metadata.name}-icon${fileExtensionIcon}`; await fs.copyFile(iconFile, path.resolve(imagesFolder, destIconFileName)); - icon = `/v3/images/${destIconFileName}`; + icon = `/images/${destIconFileName}`; } else { icon = CheTheiaPluginsYamlWriter.DEFAULT_ICON; } diff --git a/tools/build/src/meta-yaml/meta-yaml-writer.ts b/tools/build/src/meta-yaml/meta-yaml-writer.ts index 038781fe7f..167558c067 100644 --- a/tools/build/src/meta-yaml/meta-yaml-writer.ts +++ b/tools/build/src/meta-yaml/meta-yaml-writer.ts @@ -36,7 +36,7 @@ export class MetaYamlWriter { // // It must work also for single root deployments // https://che-eclipse-che.apps-crc.testing/plugin-registry/v3 - public static readonly DEFAULT_ICON = '/images/eclipse-che-logo.png'; + public static readonly DEFAULT_ICON = '/images/default.png'; convertIdToPublisherAndName(id: string): [string, string] { const values = id.split('/'); diff --git a/tools/build/tests/_data/meta/che-theia-meta.yaml b/tools/build/tests/_data/meta/che-theia-meta.yaml index 41f90b1bac..f65ac218af 100644 --- a/tools/build/tests/_data/meta/che-theia-meta.yaml +++ b/tools/build/tests/_data/meta/che-theia-meta.yaml @@ -6,7 +6,7 @@ type: Che Editor displayName: theia-ide title: Eclipse Theia development version. description: 'Eclipse Theia, get the latest release each day.' -icon: /v3/images/eclipse-che-logo.png +icon: /images/default.png category: Editor repository: 'https://github.com/eclipse-che/che-theia' firstPublicationDate: '2019-03-07' diff --git a/tools/build/tests/_data/meta/machine-exec-plugin-meta.yaml b/tools/build/tests/_data/meta/machine-exec-plugin-meta.yaml index ed8c38343e..71169c3bef 100644 --- a/tools/build/tests/_data/meta/machine-exec-plugin-meta.yaml +++ b/tools/build/tests/_data/meta/machine-exec-plugin-meta.yaml @@ -6,7 +6,7 @@ type: Che Plugin displayName: Che machine-exec Service title: Che machine-exec Service description: Che Plug-in with che-machine-exec service to provide creation terminal or tasks for Eclipse Che workspace containers. -icon: /v3/images/eclipse-che-logo.png +icon: /images/default.png category: Other repository: 'https://github.com/eclipse/che-machine-exec/' firstPublicationDate: '2019-11-07' diff --git a/tools/build/tests/_data/meta/no-container.yaml b/tools/build/tests/_data/meta/no-container.yaml index 71b633d0ad..216e9da187 100644 --- a/tools/build/tests/_data/meta/no-container.yaml +++ b/tools/build/tests/_data/meta/no-container.yaml @@ -6,7 +6,7 @@ type: Che Editor displayName: no-container title: Eclipse Theia development version. description: 'Eclipse Theia, get the latest release each day.' -icon: /v3/images/eclipse-che-logo.png +icon: /images/default.png category: Editor repository: 'https://github.com/eclipse-che/che-theia' firstPublicationDate: '2019-03-07' diff --git a/tools/build/tests/_data/meta/vscode-extension.yaml b/tools/build/tests/_data/meta/vscode-extension.yaml index 8d7f322cb1..325fb56bd2 100644 --- a/tools/build/tests/_data/meta/vscode-extension.yaml +++ b/tools/build/tests/_data/meta/vscode-extension.yaml @@ -6,7 +6,7 @@ type: VS Code extension displayName: omnisharp-theia-plugin title: omnisharp-theia-plugin description: omnisharp-theia-plugin -icon: /v3/images/eclipse-che-logo.png +icon: /images/default.png category: Other repository: 'https://github.com/redhat-developer/omnisharp-theia-plugin' firstPublicationDate: '2019-12-03' diff --git a/tools/build/tests/che-theia-plugin/che-theia-plugins-yaml-writer.spec.ts b/tools/build/tests/che-theia-plugin/che-theia-plugins-yaml-writer.spec.ts index 330c7e58f5..965d6505b5 100644 --- a/tools/build/tests/che-theia-plugin/che-theia-plugins-yaml-writer.spec.ts +++ b/tools/build/tests/che-theia-plugin/che-theia-plugins-yaml-writer.spec.ts @@ -98,7 +98,7 @@ metadata: categories: - Programming Languages repository: 'http://fake-repository' - icon: /v3/images/my-publisher-my-name-icon.png + icon: /images/my-publisher-my-name-icon.png sidecar: image: foo dependencies: @@ -154,7 +154,7 @@ metadata: categories: - Programming Languages repository: 'http://fake-repository' - icon: /v3/images/eclipse-che-logo.png + icon: /images/default.png sidecar: image: foo dependencies: @@ -231,7 +231,7 @@ metadata: categories: - Programming Languages repository: 'http://fake-repository' - icon: /v3/images/eclipse-che-logo.png + icon: /images/default.png sidecar: image: foo preferences: diff --git a/tools/build/tests/meta-yaml/meta-yaml-writer.spec.ts b/tools/build/tests/meta-yaml/meta-yaml-writer.spec.ts index 1c303e5b82..b1faf53fac 100644 --- a/tools/build/tests/meta-yaml/meta-yaml-writer.spec.ts +++ b/tools/build/tests/meta-yaml/meta-yaml-writer.spec.ts @@ -161,7 +161,7 @@ type: VS Code extension displayName: display-name title: my-title description: my-description -icon: /images/eclipse-che-logo.png +icon: /images/default.png category: Programming Languages repository: 'http://fake-repository' firstPublicationDate: '2019-01-01' @@ -239,7 +239,7 @@ type: VS Code extension displayName: display-name title: my-title description: my-description -icon: /images/eclipse-che-logo.png +icon: /images/default.png category: Programming Languages repository: 'http://fake-repository' firstPublicationDate: '2019-01-01' @@ -319,7 +319,7 @@ type: VS Code extension displayName: display-name title: my-title description: my-description -icon: /images/eclipse-che-logo.png +icon: /images/default.png category: Programming Languages repository: 'http://fake-repository' firstPublicationDate: '2019-01-01' @@ -379,7 +379,7 @@ type: VS Code extension displayName: display-name title: my-title description: my-description -icon: /images/eclipse-che-logo.png +icon: /images/default.png category: Programming Languages repository: 'http://fake-repository' firstPublicationDate: '2019-01-01' @@ -417,7 +417,7 @@ spec: {} displayName: 'minimal-endpoint', title: 'minimal-endpoint', description: 'minimal-endpoint', - icon: '/v3/images/eclipse-che-logo.png', + icon: '/images/default.png', category: 'Other', repository: 'http://fake-repository', firstPublicationDate: '2019-01-01', @@ -473,7 +473,7 @@ spec: {} displayName: 'minimal-endpoint', title: 'minimal-endpoint', description: 'minimal-endpoint', - icon: '/v3/images/eclipse-che-logo.png', + icon: '/images/default.png', category: 'Other', repository: 'http://fake-repository', firstPublicationDate: '2019-01-01', @@ -515,7 +515,7 @@ spec: {} displayName: 'minimal-endpoint', title: 'minimal-endpoint', description: 'minimal-endpoint', - icon: '/v3/images/eclipse-che-logo.png', + icon: '/images/default.png', category: 'Other', repository: 'http://fake-repository', firstPublicationDate: '2019-01-01', diff --git a/v3/images/eclipse-che-logo.png b/v3/images/default.png similarity index 100% rename from v3/images/eclipse-che-logo.png rename to v3/images/default.png