From f68bcdf4de7d281f34d9fff0e6e3f9c2f66e53e7 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Tue, 4 Oct 2022 13:52:12 -0500 Subject: [PATCH 1/9] Updated devfile metadata to be more consistent Signed-off-by: Paul Schultz --- extraDevfileEntries.yaml | 47 ++++++++++++------- stacks/dotnet50/devfile.yaml | 14 ++---- stacks/dotnet60/devfile.yaml | 14 ++---- stacks/dotnetcore31/devfile.yaml | 14 ++---- stacks/go/devfile.yaml | 7 +-- stacks/java-maven/devfile.yaml | 10 ++-- stacks/java-openliberty-gradle/devfile.yaml | 24 ++++++---- stacks/java-openliberty/devfile.yaml | 26 ++++++---- stacks/java-quarkus/devfile.yaml | 12 +++-- stacks/java-springboot/devfile.yaml | 10 ++-- stacks/java-vertx/devfile.yaml | 10 ++-- .../java-websphereliberty-gradle/devfile.yaml | 25 ++++++---- stacks/java-websphereliberty/devfile.yaml | 25 ++++++---- stacks/java-wildfly-bootable-jar/devfile.yaml | 17 +++++-- stacks/java-wildfly/devfile.yaml | 10 ++-- stacks/nodejs-angular/devfile.yaml | 6 +-- stacks/nodejs-nextjs/devfile.yaml | 6 +-- stacks/nodejs-nuxtjs/devfile.yaml | 6 +-- stacks/nodejs-react/devfile.yaml | 6 +-- stacks/nodejs-svelte/devfile.yaml | 6 +-- stacks/nodejs-vue/devfile.yaml | 6 +-- stacks/nodejs/devfile.yaml | 13 +++-- stacks/python/devfile.yaml | 27 ++++++----- 23 files changed, 195 insertions(+), 146 deletions(-) diff --git a/extraDevfileEntries.yaml b/extraDevfileEntries.yaml index 999aa915..84ee90ba 100644 --- a/extraDevfileEntries.yaml +++ b/extraDevfileEntries.yaml @@ -4,9 +4,11 @@ samples: displayName: Basic Node.js description: A simple Hello World Node.js application icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg - tags: ['NodeJS', 'Express'] - projectType: nodejs - language: nodejs + tags: + - Node.js + - Express + projectType: Node.js + language: JavaScript provider: Red Hat git: remotes: @@ -15,9 +17,11 @@ samples: displayName: Basic Quarkus description: A simple Hello World Java application using Quarkus icon: https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg - tags: ['Java', 'Quarkus'] - projectType: quarkus - language: java + tags: + - Java + - Quarkus + projectType: Quarkus + language: Java provider: Red Hat git: remotes: @@ -26,9 +30,11 @@ samples: displayName: Basic Spring Boot description: A simple Hello World Java Spring Boot application using Maven icon: https://spring.io/images/projects/spring-edf462fec682b9d48cf628eaf9e19521.svg - tags: ['Java', 'Spring'] - projectType: springboot - language: java + tags: + - Java + - Spring Boot + projectType: Spring Boot + language: Java provider: Red Hat git: remotes: @@ -37,9 +43,12 @@ samples: displayName: Basic Python description: A simple Hello World application using Python icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg - tags: ['Python'] - projectType: python - language: python + tags: + - Python + - Pip + - Flask + projectType: Python + language: Python provider: Red Hat git: remotes: @@ -48,9 +57,10 @@ samples: displayName: Basic Go description: A simple Hello World application using Go icon: https://go.dev/blog/go-brand/Go-Logo/SVG/Go-Logo_Blue.svg - tags: ['Go'] - projectType: go - language: go + tags: + - Go + projectType: Go + language: Go provider: Red Hat git: remotes: @@ -59,9 +69,10 @@ samples: displayName: Basic .NET 6.0 description: A simple application using .NET 6.0 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png - tags: ['dotnet'] - projectType: dotnet - language: dotnet + tags: + - Dotnet + projectType: Dotnet + language: Dotnet provider: Red Hat git: remotes: diff --git a/stacks/dotnet50/devfile.yaml b/stacks/dotnet50/devfile.yaml index 1db61710..f445f81a 100644 --- a/stacks/dotnet50/devfile.yaml +++ b/stacks/dotnet50/devfile.yaml @@ -4,12 +4,11 @@ metadata: displayName: .NET 5.0 description: Stack with .NET 5.0 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png - language: dotnet - projectType: dotnet + language: Dotnet + projectType: Dotnet tags: - - dotnet - version: 1.0.1 - + - Dotnet + version: 1.0.2 starterProjects: - name: s2i-example git: @@ -19,12 +18,11 @@ starterProjects: remotes: origin: https://github.com/redhat-developer/s2i-dotnetcore-ex subDir: app - components: - name: dotnet container: image: registry.access.redhat.com/ubi8/dotnet-50:5.0 - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] mountSources: true env: - name: CONFIGURATION @@ -38,7 +36,6 @@ components: endpoints: - name: http-dotnet50 targetPort: 8080 - commands: - id: build exec: @@ -48,7 +45,6 @@ commands: group: isDefault: true kind: build - - id: run exec: workingDir: ${PROJECT_SOURCE} diff --git a/stacks/dotnet60/devfile.yaml b/stacks/dotnet60/devfile.yaml index b339a1e8..ff7f0464 100644 --- a/stacks/dotnet60/devfile.yaml +++ b/stacks/dotnet60/devfile.yaml @@ -4,12 +4,11 @@ metadata: displayName: .NET 6.0 description: Stack with .NET 6.0 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png - language: dotnet - projectType: dotnet + language: Dotnet + projectType: Dotnet tags: - - dotnet - version: 1.0.0 - + - Dotnet + version: 1.0.1 starterProjects: - name: s2i-example git: @@ -19,12 +18,11 @@ starterProjects: remotes: origin: https://github.com/redhat-developer/s2i-dotnetcore-ex subDir: app - components: - name: dotnet container: image: registry.access.redhat.com/ubi8/dotnet-60:6.0 - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] mountSources: true env: - name: CONFIGURATION @@ -38,7 +36,6 @@ components: endpoints: - name: http-dotnet60 targetPort: 8080 - commands: - id: build exec: @@ -48,7 +45,6 @@ commands: group: isDefault: true kind: build - - id: run exec: workingDir: ${PROJECT_SOURCE} diff --git a/stacks/dotnetcore31/devfile.yaml b/stacks/dotnetcore31/devfile.yaml index 6369daa3..3ab4a837 100644 --- a/stacks/dotnetcore31/devfile.yaml +++ b/stacks/dotnetcore31/devfile.yaml @@ -4,12 +4,11 @@ metadata: displayName: .NET Core 3.1 description: Stack with .NET Core 3.1 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png - language: dotnet - projectType: dotnet + language: Dotnet + projectType: Dotnet tags: - - dotnet - version: 1.0.1 - + - Dotnet + version: 1.0.2 starterProjects: - name: s2i-example git: @@ -19,12 +18,11 @@ starterProjects: remotes: origin: https://github.com/redhat-developer/s2i-dotnetcore-ex subDir: app - components: - name: dotnet container: image: registry.access.redhat.com/ubi8/dotnet-31:3.1 - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] mountSources: true env: - name: CONFIGURATION @@ -38,7 +36,6 @@ components: endpoints: - name: http-dotnetcore targetPort: 8080 - commands: - id: build exec: @@ -48,7 +45,6 @@ commands: group: isDefault: true kind: build - - id: run exec: workingDir: ${PROJECT_SOURCE} diff --git a/stacks/go/devfile.yaml b/stacks/go/devfile.yaml index f4abdf1e..397364a3 100644 --- a/stacks/go/devfile.yaml +++ b/stacks/go/devfile.yaml @@ -1,7 +1,7 @@ schemaVersion: 2.1.0 metadata: description: 'Go is an open source programming language that makes it easy to build simple, reliable, and efficient software.' - displayName: Go Web App + displayName: Go Runtime icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/golang.svg name: go projectType: Go @@ -9,9 +9,10 @@ metadata: language: Go tags: - Go - version: 1.0.1 + version: 1.0.2 starterProjects: - name: go-starter + description: A Go project with a simple HTTP server git: checkoutFrom: revision: main @@ -23,7 +24,7 @@ components: - name: http-go targetPort: 8080 image: quay.io/devfile/golang:latest - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] memoryLimit: 1024Mi mountSources: true name: runtime diff --git a/stacks/java-maven/devfile.yaml b/stacks/java-maven/devfile.yaml index c4420c49..2a13ea3d 100644 --- a/stacks/java-maven/devfile.yaml +++ b/stacks/java-maven/devfile.yaml @@ -1,12 +1,14 @@ schemaVersion: 2.1.0 metadata: name: java-maven - version: 1.1.0 + version: 1.1.1 displayName: Maven Java description: Upstream Maven and OpenJDK 11 - tags: ['Java', 'Maven'] - projectType: 'maven' - language: 'java' + tags: + - Java + - Maven + projectType: Maven + language: Java icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg starterProjects: - name: springbootproject diff --git a/stacks/java-openliberty-gradle/devfile.yaml b/stacks/java-openliberty-gradle/devfile.yaml index 00b820f7..0284f26f 100644 --- a/stacks/java-openliberty-gradle/devfile.yaml +++ b/stacks/java-openliberty-gradle/devfile.yaml @@ -14,19 +14,25 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + schemaVersion: 2.1.0 metadata: name: java-openliberty-gradle - version: 0.3.1 - displayName: 'Open Liberty Gradle' + version: 0.3.2 + displayName: Open Liberty Gradle description: Java application Gradle-built stack using the Open Liberty runtime icon: https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg - tags: ['Java', 'Gradle'] - architectures: ['amd64', 'ppc64le', 's390x'] - language: 'java' - projectType: 'openliberty' - alpha.build-dockerfile: 'https://github.com/OpenLiberty/devfile-stack/releases/download/open-liberty-gradle-0.3.1/Dockerfile' - alpha.deployment-manifest: 'https://github.com/OpenLiberty/devfile-stack/releases/download/open-liberty-gradle-0.3.1/app-deploy.yaml' + tags: + - Java + - Gradle + architectures: + - amd64 + - ppc64le + - s390x + language: Java + projectType: Open Liberty + alpha.build-dockerfile: https://github.com/OpenLiberty/devfile-stack/releases/download/open-liberty-gradle-0.3.1/Dockerfile + alpha.deployment-manifest: https://github.com/OpenLiberty/devfile-stack/releases/download/open-liberty-gradle-0.3.1/app-deploy.yaml starterProjects: - name: rest git: @@ -40,7 +46,7 @@ components: - name: dev container: image: icr.io/appcafe/open-liberty-devfile-stack:{{liberty-version}}-gradle - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] memoryLimit: 1280Mi mountSources: true endpoints: diff --git a/stacks/java-openliberty/devfile.yaml b/stacks/java-openliberty/devfile.yaml index 31be7fdc..12117a8f 100644 --- a/stacks/java-openliberty/devfile.yaml +++ b/stacks/java-openliberty/devfile.yaml @@ -14,24 +14,30 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + schemaVersion: 2.1.0 metadata: name: java-openliberty - version: 0.8.1 - displayName: 'Open Liberty Maven' + version: 0.8.2 + displayName: Open Liberty Maven description: Java application Maven-built stack using the Open Liberty runtime icon: https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg - tags: ['Java', 'Maven'] - architectures: ['amd64', 'ppc64le', 's390x'] - language: 'java' - projectType: 'openliberty' - alpha.build-dockerfile: 'https://github.com/OpenLiberty/devfile-stack/releases/download/open-liberty-maven-0.8.1/Dockerfile' - alpha.deployment-manifest: 'https://github.com/OpenLiberty/devfile-stack/releases/download/open-liberty-maven-0.8.1/app-deploy.yaml' + tags: + - Java + - Maven + architectures: + - amd64 + - ppc64le + - s390x + language: Java + projectType: Open Liberty + alpha.build-dockerfile: https://github.com/OpenLiberty/devfile-stack/releases/download/open-liberty-maven-0.8.1/Dockerfile + alpha.deployment-manifest: https://github.com/OpenLiberty/devfile-stack/releases/download/open-liberty-maven-0.8.1/app-deploy.yaml starterProjects: - name: rest git: remotes: - origin: 'https://github.com/OpenLiberty/devfile-stack-starters.git' + origin: https://github.com/OpenLiberty/devfile-stack-starters.git variables: # Liberty runtime version. Minimum recommended: 21.0.0.9 liberty-version: '22.0.0.1' @@ -42,7 +48,7 @@ components: container: # In the original upstream of this devfile, the image used is openliberty/devfile-stack:, which is built from the repository: https://github.com/OpenLiberty/devfile-stack image: icr.io/appcafe/open-liberty-devfile-stack:{{liberty-version}} - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] memoryLimit: 768Mi mountSources: true endpoints: diff --git a/stacks/java-quarkus/devfile.yaml b/stacks/java-quarkus/devfile.yaml index 7134e2d8..eb20bf00 100644 --- a/stacks/java-quarkus/devfile.yaml +++ b/stacks/java-quarkus/devfile.yaml @@ -1,14 +1,16 @@ schemaVersion: 2.1.0 metadata: name: java-quarkus - version: 1.1.0 + version: 1.1.1 website: https://quarkus.io displayName: Quarkus Java description: Quarkus with Java icon: https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg - tags: ['Java', 'Quarkus'] - projectType: 'quarkus' - language: 'java' + tags: + - Java + - Quarkus + projectType: Quarkus + language: Java starterProjects: - name: community zip: @@ -20,7 +22,7 @@ components: - name: tools container: image: registry.access.redhat.com/ubi8/openjdk-11 - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] memoryLimit: 512Mi ## default app nowhere needs this but leaving room for expansion. mountSources: true volumeMounts: diff --git a/stacks/java-springboot/devfile.yaml b/stacks/java-springboot/devfile.yaml index 64730d93..08bf2edc 100644 --- a/stacks/java-springboot/devfile.yaml +++ b/stacks/java-springboot/devfile.yaml @@ -1,14 +1,16 @@ schemaVersion: 2.1.0 metadata: name: java-springboot - version: 1.1.0 + version: 1.1.1 displayName: Spring Boot® description: Spring Boot® using Java - tags: ['Java', 'Spring'] + tags: + - Java + - Spring Boot globalMemoryLimit: 2674Mi icon: https://spring.io/images/projects/spring-edf462fec682b9d48cf628eaf9e19521.svg - projectType: 'spring' - language: 'java' + projectType: Spring Boot + language: Java starterProjects: - name: springbootproject git: diff --git a/stacks/java-vertx/devfile.yaml b/stacks/java-vertx/devfile.yaml index 01196346..9e78c47b 100644 --- a/stacks/java-vertx/devfile.yaml +++ b/stacks/java-vertx/devfile.yaml @@ -1,13 +1,15 @@ schemaVersion: 2.1.0 metadata: name: java-vertx - version: 1.1.0 + version: 1.1.1 displayName: Vert.x Java description: Upstream Vert.x using Java icon: https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg - tags: ['Java', 'Vert.x'] - projectType: 'vertx' - language: 'java' + tags: + - Java + - Vert.x + projectType: Vert.x + language: Java starterProjects: - name: vertx-http-example git: diff --git a/stacks/java-websphereliberty-gradle/devfile.yaml b/stacks/java-websphereliberty-gradle/devfile.yaml index 2df9a7a8..682827c0 100644 --- a/stacks/java-websphereliberty-gradle/devfile.yaml +++ b/stacks/java-websphereliberty-gradle/devfile.yaml @@ -14,19 +14,26 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + schemaVersion: 2.1.0 metadata: name: java-websphereliberty-gradle - version: 0.3.1 - displayName: 'WebSphere Liberty Gradle' + version: 0.3.2 + displayName: WebSphere Liberty Gradle description: Java application Gradle-built stack using the WebSphere Liberty runtime icon: https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg - tags: ['Java', 'Gradle'] - architectures: ['amd64', 'ppc64le', 's390x'] - language: 'java' - projectType: 'websphereliberty' - alpha.build-dockerfile: 'https://github.com/OpenLiberty/devfile-stack/releases/download/websphere-liberty-gradle-0.3.1/Dockerfile' - alpha.deployment-manifest: 'https://github.com/OpenLiberty/devfile-stack/releases/download/websphere-liberty-gradle-0.3.1/app-deploy.yaml' + tags: + - Java + - Gradle + - WebSphere Liberty + architectures: + - amd64 + - ppc64le + - s390x + language: Java + projectType: WebSphere Liberty + alpha.build-dockerfile: https://github.com/OpenLiberty/devfile-stack/releases/download/websphere-liberty-gradle-0.3.1/Dockerfile + alpha.deployment-manifest: https://github.com/OpenLiberty/devfile-stack/releases/download/websphere-liberty-gradle-0.3.1/app-deploy.yaml starterProjects: - name: rest git: @@ -40,7 +47,7 @@ components: - name: dev container: image: icr.io/appcafe/websphere-liberty-devfile-stack:{{liberty-version}}-gradle - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] memoryLimit: 1280Mi mountSources: true endpoints: diff --git a/stacks/java-websphereliberty/devfile.yaml b/stacks/java-websphereliberty/devfile.yaml index ef5ce7ea..0d56f903 100644 --- a/stacks/java-websphereliberty/devfile.yaml +++ b/stacks/java-websphereliberty/devfile.yaml @@ -14,19 +14,26 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + schemaVersion: 2.1.0 metadata: name: java-websphereliberty - version: 0.8.1 - displayName: 'WebSphere Liberty Maven' + version: 0.8.2 + displayName: WebSphere Liberty Maven description: Java application Maven-built stack using the WebSphere Liberty runtime icon: https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg - tags: ['Java', 'Maven'] - architectures: ['amd64', 'ppc64le', 's390x'] - language: 'java' - projectType: 'websphereliberty' - alpha.build-dockerfile: 'https://github.com/OpenLiberty/devfile-stack/releases/download/websphere-liberty-maven-0.8.1/Dockerfile' - alpha.deployment-manifest: 'https://github.com/OpenLiberty/devfile-stack/releases/download/websphere-liberty-maven-0.8.1/app-deploy.yaml' + tags: + - Java + - Maven + - WebSphere Liberty + architectures: + - amd64 + - ppc64le + - s390x + language: Java + projectType: WebSphere Liberty + alpha.build-dockerfile: https://github.com/OpenLiberty/devfile-stack/releases/download/websphere-liberty-maven-0.8.1/Dockerfile + alpha.deployment-manifest: https://github.com/OpenLiberty/devfile-stack/releases/download/websphere-liberty-maven-0.8.1/app-deploy.yaml starterProjects: - name: rest git: @@ -42,7 +49,7 @@ components: container: # In the original upstream of this devfile, the image used is openliberty/devfile-stack:, which is built from the repository: https://github.com/OpenLiberty/devfile-stack image: icr.io/appcafe/websphere-liberty-devfile-stack:{{liberty-version}} - command: ["tail", "-f", "/dev/null"] + command: ['tail', '-f', '/dev/null'] memoryLimit: 768Mi mountSources: true endpoints: diff --git a/stacks/java-wildfly-bootable-jar/devfile.yaml b/stacks/java-wildfly-bootable-jar/devfile.yaml index 72c95b90..dcdc8908 100644 --- a/stacks/java-wildfly-bootable-jar/devfile.yaml +++ b/stacks/java-wildfly-bootable-jar/devfile.yaml @@ -1,14 +1,21 @@ schemaVersion: 2.1.0 metadata: name: java-wildfly-bootable-jar - version: 1.0.5 + version: 1.0.6 website: https://docs.wildfly.org/bootablejar/ displayName: WildFly Bootable Jar description: Java stack with WildFly in bootable Jar mode, OpenJDK 11 and Maven 3.5 icon: https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg - tags: ['RHEL8', 'Java', 'OpenJDK', 'Maven', 'WildFly', 'Microprofile', 'WildFly Bootable'] - projectType: 'WildFly' - language: 'java' + tags: + - RHEL8 + - Java + - OpenJDK + - Maven + - WildFly + - Microprofile + - WildFly Bootable + projectType: WildFly + language: Java starterProjects: - name: microprofile-config description: WildFly Eclipse Microprofile Config Quickstart @@ -93,7 +100,7 @@ components: - name: wildfly container: image: registry.access.redhat.com/ubi8/openjdk-11 - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] memoryLimit: 1512Mi mountSources: true volumeMounts: diff --git a/stacks/java-wildfly/devfile.yaml b/stacks/java-wildfly/devfile.yaml index 8c14adaa..19f7b2d1 100644 --- a/stacks/java-wildfly/devfile.yaml +++ b/stacks/java-wildfly/devfile.yaml @@ -1,14 +1,16 @@ schemaVersion: 2.1.0 metadata: name: java-wildfly - version: 1.0.5 + version: 1.0.6 website: https://wildfly.org displayName: WildFly Java description: Upstream WildFly icon: https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg - tags: ['Java', 'WildFly'] - projectType: 'wildfly' - language: 'java' + tags: + - Java + - WildFly + projectType: WildFly + language: Java starterProjects: - name: microprofile-config description: WildFly Eclipse Microprofile Config Quickstart diff --git a/stacks/nodejs-angular/devfile.yaml b/stacks/nodejs-angular/devfile.yaml index c428045f..c6e2556d 100644 --- a/stacks/nodejs-angular/devfile.yaml +++ b/stacks/nodejs-angular/devfile.yaml @@ -10,11 +10,11 @@ metadata: name: nodejs-angular projectType: Angular provider: Red Hat - language: Typescript + language: TypeScript tags: - NodeJS - Angular - version: 2.0.1 + version: 2.0.2 starterProjects: - name: nodejs-angular-starter git: @@ -28,7 +28,7 @@ components: - name: http-angular targetPort: 4200 image: registry.access.redhat.com/ubi8/nodejs-16:latest - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] memoryLimit: 1024Mi name: runtime commands: diff --git a/stacks/nodejs-nextjs/devfile.yaml b/stacks/nodejs-nextjs/devfile.yaml index a7b21d68..78dfe372 100644 --- a/stacks/nodejs-nextjs/devfile.yaml +++ b/stacks/nodejs-nextjs/devfile.yaml @@ -9,11 +9,11 @@ metadata: name: nodejs-nextjs projectType: Next.js provider: Red Hat - language: Typescript + language: TypeScript tags: - Node.js - Next.js - version: 1.0.2 + version: 1.0.3 starterProjects: - name: nodejs-nextjs-starter git: @@ -27,7 +27,7 @@ components: - name: http-nextjs targetPort: 3000 image: registry.access.redhat.com/ubi8/nodejs-16:latest - command: ["tail", "-f", "/dev/null"] + command: ['tail', '-f', '/dev/null'] memoryLimit: 1024Mi name: runtime commands: diff --git a/stacks/nodejs-nuxtjs/devfile.yaml b/stacks/nodejs-nuxtjs/devfile.yaml index 039cbe38..431c0f9e 100644 --- a/stacks/nodejs-nuxtjs/devfile.yaml +++ b/stacks/nodejs-nuxtjs/devfile.yaml @@ -8,11 +8,11 @@ metadata: name: nodejs-nuxtjs projectType: Nuxt.js provider: Red Hat - language: Typescript + language: TypeScript tags: - Node.js - Nuxt.js - version: 1.0.2 + version: 1.0.3 starterProjects: - name: nodejs-nuxtjs-starter git: @@ -26,7 +26,7 @@ components: - name: http-nuxtjs targetPort: 3000 image: registry.access.redhat.com/ubi8/nodejs-16:latest - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] memoryLimit: 1024Mi name: runtime commands: diff --git a/stacks/nodejs-react/devfile.yaml b/stacks/nodejs-react/devfile.yaml index 2c69fb85..8bec14c2 100644 --- a/stacks/nodejs-react/devfile.yaml +++ b/stacks/nodejs-react/devfile.yaml @@ -8,11 +8,11 @@ metadata: name: nodejs-react projectType: React provider: Red Hat - language: Typescript + language: TypeScript tags: - Node.js - React - version: 2.0.1 + version: 2.0.2 starterProjects: - name: nodejs-react-starter git: @@ -26,7 +26,7 @@ components: - name: http-react targetPort: 3000 image: registry.access.redhat.com/ubi8/nodejs-16:latest - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] memoryLimit: 1024Mi name: runtime commands: diff --git a/stacks/nodejs-svelte/devfile.yaml b/stacks/nodejs-svelte/devfile.yaml index 17b7f4f7..d927abd0 100644 --- a/stacks/nodejs-svelte/devfile.yaml +++ b/stacks/nodejs-svelte/devfile.yaml @@ -7,11 +7,11 @@ metadata: name: nodejs-svelte projectType: Svelte provider: Red Hat - language: Typescript + language: TypeScript tags: - Node.js - Svelte - version: 1.0.2 + version: 1.0.3 starterProjects: - name: nodejs-svelte-starter git: @@ -25,7 +25,7 @@ components: - name: http-svelte targetPort: 3000 image: registry.access.redhat.com/ubi8/nodejs-16:latest - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] memoryLimit: 1024Mi name: runtime commands: diff --git a/stacks/nodejs-vue/devfile.yaml b/stacks/nodejs-vue/devfile.yaml index 75684b46..ab76c1d6 100644 --- a/stacks/nodejs-vue/devfile.yaml +++ b/stacks/nodejs-vue/devfile.yaml @@ -7,11 +7,11 @@ metadata: name: nodejs-vue projectType: Vue provider: Red Hat - language: Typescript + language: TypeScript tags: - Node.js - Vue - version: 1.0.1 + version: 1.0.2 starterProjects: - name: nodejs-vue-starter git: @@ -28,7 +28,7 @@ components: - name: http-vue targetPort: 3000 image: registry.access.redhat.com/ubi8/nodejs-16:latest - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] memoryLimit: 1024Mi name: runtime commands: diff --git a/stacks/nodejs/devfile.yaml b/stacks/nodejs/devfile.yaml index f05a3fab..22a0174a 100644 --- a/stacks/nodejs/devfile.yaml +++ b/stacks/nodejs/devfile.yaml @@ -1,13 +1,16 @@ schemaVersion: 2.1.0 metadata: name: nodejs - version: 2.0.0 + version: 2.0.1 displayName: Node.js Runtime description: Stack with Node.js 16 icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg - tags: ['NodeJS', 'Express', 'ubi8'] - projectType: 'nodejs' - language: 'javascript' + tags: + - Node.js + - Express + - ubi8 + projectType: Node.js + language: JavaScript starterProjects: - name: nodejs-starter git: @@ -17,7 +20,7 @@ components: - name: runtime container: image: registry.access.redhat.com/ubi8/nodejs-16:latest - args: ["tail", "-f", "/dev/null"] + args: ['tail', '-f', '/dev/null'] memoryLimit: 1024Mi mountSources: true endpoints: diff --git a/stacks/python/devfile.yaml b/stacks/python/devfile.yaml index 47316b2d..cd838362 100644 --- a/stacks/python/devfile.yaml +++ b/stacks/python/devfile.yaml @@ -1,26 +1,29 @@ schemaVersion: 2.1.0 metadata: name: python - version: 2.0.1 - displayName: Flask + displayName: Python description: - 'Flask is a web framework, it’s a Python module that lets you develop web applications easily. - It’s has a small and easy-to-extend core: it’s a microframework that doesn’t include an ORM (Object Relational Manager) or such features.' - icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/flask.svg - projectType: Flask + 'Python is an interpreted, object-oriented, high-level programming language with dynamic semantics. + Its high-level built in data structures, combined with dynamic typing and dynamic binding, make it very attractive for Rapid Application Development, as well as for use as a scripting or glue language to connect existing components together.' + icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg + projectType: Python provider: Red Hat language: Python tags: - - Flask - Python - Pip + - Flask + version: 2.0.2 starterProjects: - name: flask-example + description: + 'Flask is a web framework, it’s a Python module that lets you develop web applications easily. + It’s has a small and easy-to-extend core: it’s a microframework that doesn’t include an ORM (Object Relational Manager) or such features.' git: remotes: origin: https://github.com/devfile-samples/python-ex components: - - name: py-web + - name: py container: image: registry.access.redhat.com/ubi9/python-39:latest args: ['tail', '-f', '/dev/null'] @@ -39,19 +42,19 @@ commands: group: kind: build isDefault: true - component: py-web + component: py - id: run-app exec: commandLine: 'python app.py' workingDir: ${PROJECT_SOURCE} - component: py-web + component: py group: kind: run isDefault: true - - id: debugpy + - id: debug-py exec: commandLine: 'pip install debugpy && python -m debugpy --listen 0.0.0.0:${DEBUG_PORT} app.py' workingDir: ${PROJECT_SOURCE} - component: py-web + component: py group: kind: debug From 1cb9e001c2939f68fdc715796a4de8aed7ac16a2 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Wed, 12 Oct 2022 17:12:33 -0500 Subject: [PATCH 2/9] updated version for open/websphere, maven/gradle Signed-off-by: Paul Schultz --- stacks/dotnet50/devfile.yaml | 5 +++-- stacks/dotnet60/devfile.yaml | 5 +++-- stacks/dotnetcore31/devfile.yaml | 5 +++-- stacks/java-openliberty-gradle/devfile.yaml | 2 +- stacks/java-openliberty/devfile.yaml | 2 +- stacks/java-websphereliberty-gradle/devfile.yaml | 2 +- stacks/java-websphereliberty/devfile.yaml | 2 +- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/stacks/dotnet50/devfile.yaml b/stacks/dotnet50/devfile.yaml index 497647a8..97703254 100644 --- a/stacks/dotnet50/devfile.yaml +++ b/stacks/dotnet50/devfile.yaml @@ -4,10 +4,11 @@ metadata: displayName: .NET 5.0 description: Stack with .NET 5.0 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png - language: Dotnet - projectType: Dotnet + language: .NET + projectType: .NET tags: - Dotnet + - .Net version: 1.0.3 starterProjects: - name: dotnet-example diff --git a/stacks/dotnet60/devfile.yaml b/stacks/dotnet60/devfile.yaml index e6eaaacf..833a3fc4 100644 --- a/stacks/dotnet60/devfile.yaml +++ b/stacks/dotnet60/devfile.yaml @@ -4,10 +4,11 @@ metadata: displayName: .NET 6.0 description: Stack with .NET 6.0 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png - language: Dotnet - projectType: Dotnet + language: .NET + projectType: .NET tags: - Dotnet + - .NET version: 1.0.2 starterProjects: - name: dotnet-example diff --git a/stacks/dotnetcore31/devfile.yaml b/stacks/dotnetcore31/devfile.yaml index 6f1b0bef..e0aeea94 100644 --- a/stacks/dotnetcore31/devfile.yaml +++ b/stacks/dotnetcore31/devfile.yaml @@ -4,10 +4,11 @@ metadata: displayName: .NET Core 3.1 description: Stack with .NET Core 3.1 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png - language: Dotnet - projectType: Dotnet + language: .NET + projectType: .NET tags: - Dotnet + - .NET version: 1.0.3 starterProjects: - name: dotnetcore-example diff --git a/stacks/java-openliberty-gradle/devfile.yaml b/stacks/java-openliberty-gradle/devfile.yaml index 0284f26f..4fb764b9 100644 --- a/stacks/java-openliberty-gradle/devfile.yaml +++ b/stacks/java-openliberty-gradle/devfile.yaml @@ -18,7 +18,7 @@ schemaVersion: 2.1.0 metadata: name: java-openliberty-gradle - version: 0.3.2 + version: 0.3.1 displayName: Open Liberty Gradle description: Java application Gradle-built stack using the Open Liberty runtime icon: https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg diff --git a/stacks/java-openliberty/devfile.yaml b/stacks/java-openliberty/devfile.yaml index 12117a8f..bfd1e9be 100644 --- a/stacks/java-openliberty/devfile.yaml +++ b/stacks/java-openliberty/devfile.yaml @@ -18,7 +18,7 @@ schemaVersion: 2.1.0 metadata: name: java-openliberty - version: 0.8.2 + version: 0.8.1 displayName: Open Liberty Maven description: Java application Maven-built stack using the Open Liberty runtime icon: https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg diff --git a/stacks/java-websphereliberty-gradle/devfile.yaml b/stacks/java-websphereliberty-gradle/devfile.yaml index 81b910f6..b2d42a4c 100644 --- a/stacks/java-websphereliberty-gradle/devfile.yaml +++ b/stacks/java-websphereliberty-gradle/devfile.yaml @@ -18,7 +18,7 @@ schemaVersion: 2.1.0 metadata: name: java-websphereliberty-gradle - version: 0.3.2 + version: 0.3.1 displayName: WebSphere Liberty Gradle description: Java application Gradle-built stack using the WebSphere Liberty runtime icon: https://raw.githubusercontent.com/WASdev/logos/main/liberty-was-500-purple.svg diff --git a/stacks/java-websphereliberty/devfile.yaml b/stacks/java-websphereliberty/devfile.yaml index 3417c94f..6172a608 100644 --- a/stacks/java-websphereliberty/devfile.yaml +++ b/stacks/java-websphereliberty/devfile.yaml @@ -18,7 +18,7 @@ schemaVersion: 2.1.0 metadata: name: java-websphereliberty - version: 0.8.2 + version: 0.8.1 displayName: WebSphere Liberty Maven description: Java application Maven-built stack using the WebSphere Liberty runtime icon: https://raw.githubusercontent.com/WASdev/logos/main/liberty-was-500-purple.svg From f6873212e65d105b311062bbad738f359386fed2 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Wed, 12 Oct 2022 17:14:16 -0500 Subject: [PATCH 3/9] updated dotnet Signed-off-by: Paul Schultz --- extraDevfileEntries.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extraDevfileEntries.yaml b/extraDevfileEntries.yaml index 84ee90ba..f7e59d19 100644 --- a/extraDevfileEntries.yaml +++ b/extraDevfileEntries.yaml @@ -71,8 +71,9 @@ samples: icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png tags: - Dotnet - projectType: Dotnet - language: Dotnet + - .NET + projectType: .NET + language: .NET provider: Red Hat git: remotes: From e4657c412e4522cabf8a5599652adb3e32e5c4d4 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Thu, 13 Oct 2022 10:32:57 -0500 Subject: [PATCH 4/9] explicitly pull ginkgo@2.1.4 Signed-off-by: Paul Schultz --- .github/workflows/validate-devfiles.yaml | 119 +++++++++++------------ 1 file changed, 59 insertions(+), 60 deletions(-) diff --git a/.github/workflows/validate-devfiles.yaml b/.github/workflows/validate-devfiles.yaml index 43456742..de65dccf 100644 --- a/.github/workflows/validate-devfiles.yaml +++ b/.github/workflows/validate-devfiles.yaml @@ -17,9 +17,9 @@ name: Validate Devfile stacks on: push: - branches: [ main ] + branches: [main] pull_request: - branches: [ main ] + branches: [main] schedule: - cron: 0 5 * * * @@ -32,74 +32,73 @@ jobs: name: check for non-terminating images runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v1 - - name: Setup Minikube - uses: manusa/actions-setup-minikube@v2.7.0 - with: - minikube version: ${{ env.MINIKUBE_VERSION }} - kubernetes version: ${{ env.KUBERNETES_VERSION }} - driver: 'docker' - github token: ${{ secrets.GITHUB_TOKEN }} - start args: '--addons=ingress' + - name: Checkout + uses: actions/checkout@v1 + - name: Setup Minikube + uses: manusa/actions-setup-minikube@v2.7.0 + with: + minikube version: ${{ env.MINIKUBE_VERSION }} + kubernetes version: ${{ env.KUBERNETES_VERSION }} + driver: 'docker' + github token: ${{ secrets.GITHUB_TOKEN }} + start args: '--addons=ingress' - - name: Check that containers components are non terminating - run: tests/check_non_terminating.sh + - name: Check that containers components are non terminating + run: tests/check_non_terminating.sh odov3: name: with odo v3 runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v1 - - name: Setup Minikube - uses: manusa/actions-setup-minikube@v2.7.0 - with: - minikube version: ${{ env.MINIKUBE_VERSION }} - kubernetes version: ${{ env.KUBERNETES_VERSION }} - driver: 'docker' - github token: ${{ secrets.GITHUB_TOKEN }} - start args: '--addons=ingress' + - name: Checkout + uses: actions/checkout@v1 + - name: Setup Minikube + uses: manusa/actions-setup-minikube@v2.7.0 + with: + minikube version: ${{ env.MINIKUBE_VERSION }} + kubernetes version: ${{ env.KUBERNETES_VERSION }} + driver: 'docker' + github token: ${{ secrets.GITHUB_TOKEN }} + start args: '--addons=ingress' - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: '1.19' - - name: Install odo v3 - # Uses odo from main branch. - # Once odo v3.0.0 is officialy released this should be updated to use redhat-actions/openshift-tools-installer@v1 - run: | - git clone https://github.com/redhat-developer/odo /tmp/odo - cd /tmp/odo - make install - - name: "Install Ginkgo" - run: go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo - - name: Check odo version - run: odo version - - name: Check the devfile stacks with odo v3 - run: tests/check_odov3.sh + - name: Install Go + uses: actions/setup-go@v3 + with: + go-version: '1.19' + - name: Install odo v3 + # Uses odo from main branch. + # Once odo v3.0.0 is officialy released this should be updated to use redhat-actions/openshift-tools-installer@v1 + run: | + git clone https://github.com/redhat-developer/odo /tmp/odo + cd /tmp/odo + make install + - name: 'Install Ginkgo' + run: go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.1.4 + - name: Check odo version + run: odo version + - name: Check the devfile stacks with odo v3 + run: tests/check_odov3.sh odov2: name: with odo v2 runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v1 - - name: Setup Minikube - uses: manusa/actions-setup-minikube@v2.7.0 - with: - minikube version: ${{ env.MINIKUBE_VERSION }} - kubernetes version: ${{ env.KUBERNETES_VERSION }} - driver: 'docker' - github token: ${{ secrets.GITHUB_TOKEN }} - start args: '--addons=ingress' - - - name: Install odo v2 - uses: redhat-actions/openshift-tools-installer@v1 - with: - odo: "2.5.1" - - name: Check odo version - run: odo version - - name: Check the devfile stacks with odo v2 - run: tests/check_odov2.sh odo + - name: Checkout + uses: actions/checkout@v1 + - name: Setup Minikube + uses: manusa/actions-setup-minikube@v2.7.0 + with: + minikube version: ${{ env.MINIKUBE_VERSION }} + kubernetes version: ${{ env.KUBERNETES_VERSION }} + driver: 'docker' + github token: ${{ secrets.GITHUB_TOKEN }} + start args: '--addons=ingress' + - name: Install odo v2 + uses: redhat-actions/openshift-tools-installer@v1 + with: + odo: '2.5.1' + - name: Check odo version + run: odo version + - name: Check the devfile stacks with odo v2 + run: tests/check_odov2.sh odo From c79cc4d61eff8f69c298933853cfbe60be2f897a Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 14 Oct 2022 14:09:11 -0500 Subject: [PATCH 5/9] changed .NET language and projectType to dotnet Signed-off-by: Paul Schultz --- .github/workflows/validate-devfiles.yaml | 2 +- extraDevfileEntries.yaml | 4 ++-- stacks/dotnet50/devfile.yaml | 4 ++-- stacks/dotnet60/devfile.yaml | 4 ++-- stacks/dotnetcore31/devfile.yaml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/validate-devfiles.yaml b/.github/workflows/validate-devfiles.yaml index de65dccf..37383d4a 100644 --- a/.github/workflows/validate-devfiles.yaml +++ b/.github/workflows/validate-devfiles.yaml @@ -73,7 +73,7 @@ jobs: cd /tmp/odo make install - name: 'Install Ginkgo' - run: go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.1.4 + run: go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo - name: Check odo version run: odo version - name: Check the devfile stacks with odo v3 diff --git a/extraDevfileEntries.yaml b/extraDevfileEntries.yaml index f7e59d19..4715f907 100644 --- a/extraDevfileEntries.yaml +++ b/extraDevfileEntries.yaml @@ -72,8 +72,8 @@ samples: tags: - Dotnet - .NET - projectType: .NET - language: .NET + projectType: dotnet + language: dotnet provider: Red Hat git: remotes: diff --git a/stacks/dotnet50/devfile.yaml b/stacks/dotnet50/devfile.yaml index 97703254..aa2c7b28 100644 --- a/stacks/dotnet50/devfile.yaml +++ b/stacks/dotnet50/devfile.yaml @@ -4,8 +4,8 @@ metadata: displayName: .NET 5.0 description: Stack with .NET 5.0 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png - language: .NET - projectType: .NET + language: dotnet + projectType: dotnet tags: - Dotnet - .Net diff --git a/stacks/dotnet60/devfile.yaml b/stacks/dotnet60/devfile.yaml index 833a3fc4..92120e0d 100644 --- a/stacks/dotnet60/devfile.yaml +++ b/stacks/dotnet60/devfile.yaml @@ -4,8 +4,8 @@ metadata: displayName: .NET 6.0 description: Stack with .NET 6.0 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png - language: .NET - projectType: .NET + language: dotnet + projectType: dotnet tags: - Dotnet - .NET diff --git a/stacks/dotnetcore31/devfile.yaml b/stacks/dotnetcore31/devfile.yaml index e0aeea94..abad5aa0 100644 --- a/stacks/dotnetcore31/devfile.yaml +++ b/stacks/dotnetcore31/devfile.yaml @@ -4,8 +4,8 @@ metadata: displayName: .NET Core 3.1 description: Stack with .NET Core 3.1 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png - language: .NET - projectType: .NET + language: dotnet + projectType: dotnet tags: - Dotnet - .NET From a05c283d3e2e0206831fca2500ee108e7efda18e Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 14 Oct 2022 14:17:42 -0500 Subject: [PATCH 6/9] changed ginkgo version Signed-off-by: Paul Schultz --- .github/workflows/validate-devfiles.yaml | 2 +- extraDevfileEntries.yaml | 3 +-- stacks/dotnet50/devfile.yaml | 3 +-- stacks/dotnet60/devfile.yaml | 3 +-- stacks/dotnetcore31/devfile.yaml | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/validate-devfiles.yaml b/.github/workflows/validate-devfiles.yaml index 37383d4a..de65dccf 100644 --- a/.github/workflows/validate-devfiles.yaml +++ b/.github/workflows/validate-devfiles.yaml @@ -73,7 +73,7 @@ jobs: cd /tmp/odo make install - name: 'Install Ginkgo' - run: go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo + run: go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.1.4 - name: Check odo version run: odo version - name: Check the devfile stacks with odo v3 diff --git a/extraDevfileEntries.yaml b/extraDevfileEntries.yaml index 4715f907..218d0912 100644 --- a/extraDevfileEntries.yaml +++ b/extraDevfileEntries.yaml @@ -70,8 +70,7 @@ samples: description: A simple application using .NET 6.0 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png tags: - - Dotnet - - .NET + - dotnet projectType: dotnet language: dotnet provider: Red Hat diff --git a/stacks/dotnet50/devfile.yaml b/stacks/dotnet50/devfile.yaml index aa2c7b28..f49fdbfb 100644 --- a/stacks/dotnet50/devfile.yaml +++ b/stacks/dotnet50/devfile.yaml @@ -7,8 +7,7 @@ metadata: language: dotnet projectType: dotnet tags: - - Dotnet - - .Net + - dotnet version: 1.0.3 starterProjects: - name: dotnet-example diff --git a/stacks/dotnet60/devfile.yaml b/stacks/dotnet60/devfile.yaml index 92120e0d..0c3151cd 100644 --- a/stacks/dotnet60/devfile.yaml +++ b/stacks/dotnet60/devfile.yaml @@ -7,8 +7,7 @@ metadata: language: dotnet projectType: dotnet tags: - - Dotnet - - .NET + - dotnet version: 1.0.2 starterProjects: - name: dotnet-example diff --git a/stacks/dotnetcore31/devfile.yaml b/stacks/dotnetcore31/devfile.yaml index abad5aa0..9bc5f0b1 100644 --- a/stacks/dotnetcore31/devfile.yaml +++ b/stacks/dotnetcore31/devfile.yaml @@ -7,8 +7,7 @@ metadata: language: dotnet projectType: dotnet tags: - - Dotnet - - .NET + - dotnet version: 1.0.3 starterProjects: - name: dotnetcore-example From 319260c71a4b151bd2709674f35797b084c9a63f Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Tue, 18 Oct 2022 10:54:36 -0500 Subject: [PATCH 7/9] removed java-openliberty and java-websphereliberty from odo v3 tests Signed-off-by: Paul Schultz --- .github/workflows/validate-devfiles.yaml | 7 +++++-- extraDevfileEntries.yaml | 6 +++--- stacks/dotnet50/devfile.yaml | 6 +++--- stacks/dotnet60/devfile.yaml | 6 +++--- stacks/dotnetcore31/devfile.yaml | 6 +++--- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/validate-devfiles.yaml b/.github/workflows/validate-devfiles.yaml index de65dccf..d5c2a3da 100644 --- a/.github/workflows/validate-devfiles.yaml +++ b/.github/workflows/validate-devfiles.yaml @@ -67,7 +67,7 @@ jobs: go-version: '1.19' - name: Install odo v3 # Uses odo from main branch. - # Once odo v3.0.0 is officialy released this should be updated to use redhat-actions/openshift-tools-installer@v1 + # Once odo v3.0.0 is officially released this should be updated to use redhat-actions/openshift-tools-installer@v1 run: | git clone https://github.com/redhat-developer/odo /tmp/odo cd /tmp/odo @@ -77,7 +77,10 @@ jobs: - name: Check odo version run: odo version - name: Check the devfile stacks with odo v3 - run: tests/check_odov3.sh + run: | + tests/check_odov3.sh \ + --skip="stack: java-openliberty" \ + --skip="stack: java-websphereliberty" \ odov2: name: with odo v2 diff --git a/extraDevfileEntries.yaml b/extraDevfileEntries.yaml index 218d0912..8bb181f1 100644 --- a/extraDevfileEntries.yaml +++ b/extraDevfileEntries.yaml @@ -70,9 +70,9 @@ samples: description: A simple application using .NET 6.0 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png tags: - - dotnet - projectType: dotnet - language: dotnet + - .NET + projectType: .NET + language: .NET provider: Red Hat git: remotes: diff --git a/stacks/dotnet50/devfile.yaml b/stacks/dotnet50/devfile.yaml index f49fdbfb..40af6dd7 100644 --- a/stacks/dotnet50/devfile.yaml +++ b/stacks/dotnet50/devfile.yaml @@ -4,10 +4,10 @@ metadata: displayName: .NET 5.0 description: Stack with .NET 5.0 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png - language: dotnet - projectType: dotnet + language: .NET + projectType: .NET tags: - - dotnet + - .NET version: 1.0.3 starterProjects: - name: dotnet-example diff --git a/stacks/dotnet60/devfile.yaml b/stacks/dotnet60/devfile.yaml index 0c3151cd..009b352d 100644 --- a/stacks/dotnet60/devfile.yaml +++ b/stacks/dotnet60/devfile.yaml @@ -4,10 +4,10 @@ metadata: displayName: .NET 6.0 description: Stack with .NET 6.0 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png - language: dotnet - projectType: dotnet + language: .NET + projectType: .NET tags: - - dotnet + - .NET version: 1.0.2 starterProjects: - name: dotnet-example diff --git a/stacks/dotnetcore31/devfile.yaml b/stacks/dotnetcore31/devfile.yaml index 9bc5f0b1..f07531ed 100644 --- a/stacks/dotnetcore31/devfile.yaml +++ b/stacks/dotnetcore31/devfile.yaml @@ -4,10 +4,10 @@ metadata: displayName: .NET Core 3.1 description: Stack with .NET Core 3.1 icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png - language: dotnet - projectType: dotnet + language: .NET + projectType: .NET tags: - - dotnet + - .NET version: 1.0.3 starterProjects: - name: dotnetcore-example From 61625e8bc617413688442af5b2ac10507b5be8cf Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Tue, 18 Oct 2022 10:56:31 -0500 Subject: [PATCH 8/9] added concurrency check in the github actions Signed-off-by: Paul Schultz --- .github/workflows/check-architectures.yaml | 84 +++++++++-------- .github/workflows/ci.yaml | 30 +++--- .github/workflows/comment-pr.yaml | 102 +++++++++++---------- .github/workflows/pushimge-next.yaml | 55 +++++------ .github/workflows/trigger-redeploy.yaml | 24 +++-- .github/workflows/validate-devfiles.yaml | 4 + 6 files changed, 161 insertions(+), 138 deletions(-) diff --git a/.github/workflows/check-architectures.yaml b/.github/workflows/check-architectures.yaml index 68e8a6e9..06b545dc 100644 --- a/.github/workflows/check-architectures.yaml +++ b/.github/workflows/check-architectures.yaml @@ -16,49 +16,53 @@ name: Check Architectures on: pull_request: - branches: [ main ] + branches: [main] + +concurrency: + group: ${{ github.workflow }}-${{ github.event.number || github.ref }} + cancel-in-progress: true jobs: check_architectures: name: Check Stack and Sample Architectures runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Install yq command - uses: redhat-actions/openshift-tools-installer@v1 - with: - source: "github" - github_pat: ${{ secrets.GITHUB_TOKEN }} - # Installs the latest release of yq - yq: "latest" - - name: Get git diff - id: diff - uses: technote-space/get-diff-action@v4 - with: - PATTERNS: | - +(stacks)/**/devfile.yaml - extraDevfileEntries.yaml - - name: Print the diff - run: echo git diff ${{ env.GIT_DIFF }} - - name: Save PR number - run: | - mkdir -p ./pr - echo ${{ github.event.number }} > ./pr/number - - name: Check stacks and samples output - continue-on-error: true - run: tests/check_architectures.sh "${{ env.GIT_DIFF }}" yq >> ./pr/output - - name: Find Comment in PR - uses: peter-evans/find-comment@v1 - id: find - with: - issue-number: ${{ github.event.number }} - comment-author: 'github-actions[bot]' - body-includes: Please check if your stack/sample devfile has architectures mentioned. - - name: Save Comment ID - if: ${{ steps.find.outputs.comment-id != '' }} - run: echo ${{ steps.find.outputs.comment-id }} > ./pr/commentid - - uses: actions/upload-artifact@v2 - with: - name: pr - path: pr/ + - name: Checkout + uses: actions/checkout@v2 + - name: Install yq command + uses: redhat-actions/openshift-tools-installer@v1 + with: + source: 'github' + github_pat: ${{ secrets.GITHUB_TOKEN }} + # Installs the latest release of yq + yq: 'latest' + - name: Get git diff + id: diff + uses: technote-space/get-diff-action@v4 + with: + PATTERNS: | + +(stacks)/**/devfile.yaml + extraDevfileEntries.yaml + - name: Print the diff + run: echo git diff ${{ env.GIT_DIFF }} + - name: Save PR number + run: | + mkdir -p ./pr + echo ${{ github.event.number }} > ./pr/number + - name: Check stacks and samples output + continue-on-error: true + run: tests/check_architectures.sh "${{ env.GIT_DIFF }}" yq >> ./pr/output + - name: Find Comment in PR + uses: peter-evans/find-comment@v1 + id: find + with: + issue-number: ${{ github.event.number }} + comment-author: 'github-actions[bot]' + body-includes: Please check if your stack/sample devfile has architectures mentioned. + - name: Save Comment ID + if: ${{ steps.find.outputs.comment-id != '' }} + run: echo ${{ steps.find.outputs.comment-id }} > ./pr/commentid + - uses: actions/upload-artifact@v2 + with: + name: pr + path: pr/ diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 141abdad..d4933352 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,23 +16,27 @@ name: CI on: push: - branches: [ main ] + branches: [main] pull_request: - branches: [ main ] + branches: [main] + +concurrency: + group: ${{ github.workflow }}-${{ github.event.number || github.ref }} + cancel-in-progress: true jobs: build: name: Check registry build runs-on: ubuntu-latest steps: - - name: Check out code - uses: actions/checkout@v2 - with: - path: registry-repo - - name: Setup Go environment - uses: actions/setup-go@v2 - with: - go-version: 1.13 - - - name: Check if devfile registry build is working - run: registry-repo/.ci/build.sh \ No newline at end of file + - name: Check out code + uses: actions/checkout@v2 + with: + path: registry-repo + - name: Setup Go environment + uses: actions/setup-go@v2 + with: + go-version: 1.13 + + - name: Check if devfile registry build is working + run: registry-repo/.ci/build.sh diff --git a/.github/workflows/comment-pr.yaml b/.github/workflows/comment-pr.yaml index 4bf3c26a..73b469ce 100644 --- a/.github/workflows/comment-pr.yaml +++ b/.github/workflows/comment-pr.yaml @@ -18,60 +18,64 @@ name: Comment on PR on: workflow_run: workflows: - - "Check Architectures" + - 'Check Architectures' types: - completed +concurrency: + group: ${{ github.workflow }}-${{ github.event.number || github.ref }} + cancel-in-progress: true + jobs: comment: runs-on: ubuntu-latest steps: - - name: Download PR artifact - uses: actions/github-script@v3.1.0 - with: - script: | - var artifacts = await github.actions.listWorkflowRunArtifacts({ - owner: context.repo.owner, - repo: context.repo.repo, - run_id: ${{github.event.workflow_run.id }}, - }); - var matchArtifact = artifacts.data.artifacts.filter((artifact) => { - return artifact.name == "pr" - })[0]; - var download = await github.actions.downloadArtifact({ - owner: context.repo.owner, - repo: context.repo.repo, - artifact_id: matchArtifact.id, - archive_format: 'zip', - }); - var fs = require('fs'); - fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data)); - - run: unzip pr.zip - - name: Comment on PR if there is output - uses: actions/github-script@v3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - var fs = require('fs'); - var test_output = String(fs.readFileSync('./output')); - var header = "Please check if your stack/sample devfile has architectures mentioned.\n" - if (test_output) { - test_output = header + test_output - if (fs.existsSync('./commentid')) { - var comment_id = Number(fs.readFileSync('./commentid')); - await github.issues.updateComment({ - owner: context.repo.owner, - repo: context.repo.repo, - comment_id: comment_id, - body: test_output - }); - } else { - var issue_number = Number(fs.readFileSync('./number')); - await github.issues.createComment({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: issue_number, - body: test_output - }); + - name: Download PR artifact + uses: actions/github-script@v3.1.0 + with: + script: | + var artifacts = await github.actions.listWorkflowRunArtifacts({ + owner: context.repo.owner, + repo: context.repo.repo, + run_id: ${{github.event.workflow_run.id }}, + }); + var matchArtifact = artifacts.data.artifacts.filter((artifact) => { + return artifact.name == "pr" + })[0]; + var download = await github.actions.downloadArtifact({ + owner: context.repo.owner, + repo: context.repo.repo, + artifact_id: matchArtifact.id, + archive_format: 'zip', + }); + var fs = require('fs'); + fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data)); + - run: unzip pr.zip + - name: Comment on PR if there is output + uses: actions/github-script@v3 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + var fs = require('fs'); + var test_output = String(fs.readFileSync('./output')); + var header = "Please check if your stack/sample devfile has architectures mentioned.\n" + if (test_output) { + test_output = header + test_output + if (fs.existsSync('./commentid')) { + var comment_id = Number(fs.readFileSync('./commentid')); + await github.issues.updateComment({ + owner: context.repo.owner, + repo: context.repo.repo, + comment_id: comment_id, + body: test_output + }); + } else { + var issue_number = Number(fs.readFileSync('./number')); + await github.issues.createComment({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: issue_number, + body: test_output + }); + } } - } diff --git a/.github/workflows/pushimge-next.yaml b/.github/workflows/pushimge-next.yaml index 004fcdfa..ca4e86ce 100644 --- a/.github/workflows/pushimge-next.yaml +++ b/.github/workflows/pushimge-next.yaml @@ -16,36 +16,39 @@ name: Next Dockerimage on: push: - branches: [ main ] + branches: [main] repository_dispatch: types: [build] -jobs: +concurrency: + group: ${{ github.workflow }}-${{ github.event.number || github.ref }} + cancel-in-progress: true +jobs: build: runs-on: ubuntu-latest steps: - - name: Checkout registry build tools - uses: actions/checkout@v2 - with: - repository: devfile/registry-support - persist-credentials: false - path: registry-support - - name: Check out code - uses: actions/checkout@v2 - with: - path: registry-repo - - name: Setup Go environment - uses: actions/setup-go@v2 - with: - go-version: 1.13 - - name: Login to Quay - uses: docker/login-action@v1 - with: - registry: quay.io - username: ${{ secrets.QUAY_USERNAME }} - password: ${{ secrets.QUAY_PASSWORD }} - - name: Build the devfile-index docker image - run: registry-repo/.ci/build.sh - - name: Push the devfile-index docker image - run: registry-support/build-tools/push.sh quay.io/devfile/devfile-index:next \ No newline at end of file + - name: Checkout registry build tools + uses: actions/checkout@v2 + with: + repository: devfile/registry-support + persist-credentials: false + path: registry-support + - name: Check out code + uses: actions/checkout@v2 + with: + path: registry-repo + - name: Setup Go environment + uses: actions/setup-go@v2 + with: + go-version: 1.13 + - name: Login to Quay + uses: docker/login-action@v1 + with: + registry: quay.io + username: ${{ secrets.QUAY_USERNAME }} + password: ${{ secrets.QUAY_PASSWORD }} + - name: Build the devfile-index docker image + run: registry-repo/.ci/build.sh + - name: Push the devfile-index docker image + run: registry-support/build-tools/push.sh quay.io/devfile/devfile-index:next diff --git a/.github/workflows/trigger-redeploy.yaml b/.github/workflows/trigger-redeploy.yaml index c3c46c8f..530c3ef8 100644 --- a/.github/workflows/trigger-redeploy.yaml +++ b/.github/workflows/trigger-redeploy.yaml @@ -18,19 +18,23 @@ on: repository_dispatch: types: [build] +concurrency: + group: ${{ github.workflow }}-${{ github.event.number || github.ref }} + cancel-in-progress: true + jobs: build: name: Check registry build runs-on: ubuntu-latest steps: - - name: Check out code - uses: actions/checkout@v2 - with: - persist-credentials: false + - name: Check out code + uses: actions/checkout@v2 + with: + persist-credentials: false - - name: Trigger Deploy to Staging - run: | - git config --global user.email "${{secrets.CI_ROBOT_EMAIL}}" - git config --global user.name "${{secrets.CI_ROBOT_NAME}}" - git commit --allow-empty -m "Trigger deploy based on devfile/${{ github.event.client_payload.repo }}@${{ github.event.client_payload.sha }}" - git push "https://${{secrets.CI_ROBOT}}:${{secrets.REPO_ACCESS_TOKEN}}@github.com/devfile/registry" + - name: Trigger Deploy to Staging + run: | + git config --global user.email "${{secrets.CI_ROBOT_EMAIL}}" + git config --global user.name "${{secrets.CI_ROBOT_NAME}}" + git commit --allow-empty -m "Trigger deploy based on devfile/${{ github.event.client_payload.repo }}@${{ github.event.client_payload.sha }}" + git push "https://${{secrets.CI_ROBOT}}:${{secrets.REPO_ACCESS_TOKEN}}@github.com/devfile/registry" diff --git a/.github/workflows/validate-devfiles.yaml b/.github/workflows/validate-devfiles.yaml index d5c2a3da..966a56b3 100644 --- a/.github/workflows/validate-devfiles.yaml +++ b/.github/workflows/validate-devfiles.yaml @@ -23,6 +23,10 @@ on: schedule: - cron: 0 5 * * * +concurrency: + group: ${{ github.workflow }}-${{ github.event.number || github.ref }} + cancel-in-progress: true + env: MINIKUBE_VERSION: 'v1.27.0' KUBERNETES_VERSION: 'v1.25.2' From f3c25549cd815b64fd2f225a5b33a20c60662c9a Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Tue, 18 Oct 2022 13:37:46 -0500 Subject: [PATCH 9/9] added editorconfug and gitattributes Signed-off-by: Paul Schultz --- .editorconfig | 9 +++ .gitattributes | 95 ++++++++++++++++++++++++ .github/workflows/validate-devfiles.yaml | 5 +- stacks/dotnet50/devfile.yaml | 2 +- stacks/dotnet60/devfile.yaml | 2 +- tests/check_odov3.sh | 2 + 6 files changed, 109 insertions(+), 6 deletions(-) create mode 100644 .editorconfig create mode 100644 .gitattributes diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..c6c8b362 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..bccc1bcd --- /dev/null +++ b/.gitattributes @@ -0,0 +1,95 @@ +# source code +*.php eol=lf +*.css eol=lf +*.sass eol=lf +*.scss eol=lf +*.less eol=lf +*.styl eol=lf +*.js eol=lf +*.ts eol=lf +*.jsx eol=lf +*.tsx eol=lf +*.coffee eol=lf +*.json eol=lf +*.htm eol=lf +*.html eol=lf +*.xml eol=lf +*.svg eol=lf +*.txt eol=lf +*.ini eol=lf +*.inc eol=lf +*.pl eol=lf +*.rb eol=lf +*.py eol=lf +*.scm eol=lf +*.sql eol=lf +*.sh eol=lf +*.bat eol=lf +*.go eol=lf + +# templates +*.ejs eol=lf +*.hbt eol=lf +*.jade eol=lf +*.haml eol=lf +*.hbs eol=lf +*.dot eol=lf +*.tmpl eol=lf +*.phtml eol=lf + +# server config +.htaccess eol=lf + +# git config +.gitattributes eol=lf +.gitignore eol=lf +.gitconfig eol=lf + +# code analysis config +.jshintrc eol=lf +.jscsrc eol=lf +.jshintignore eol=lf +.csslintrc eol=lf + +# misc config +*.yaml eol=lf +*.yml eol=lf +.editorconfig eol=lf + +# build config +*.npmignore eol=lf +*.bowerrc eol=lf + +# Heroku +Procfile eol=lf +.slugignore eol=lf + +# Documentation +*.md eol=lf +LICENSE eol=lf +AUTHORS eol=lf + +# +## These files are binary and should be left untouched +# + +# (binary is a macro for -eol=lf -diff) +*.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.ico binary +*.mov binary +*.mp4 binary +*.mp3 binary +*.flv binary +*.fla binary +*.swf binary +*.gz binary +*.zip binary +*.7z binary +*.ttf binary +*.eot binary +*.woff binary +*.pyc binary +*.pdf binary diff --git a/.github/workflows/validate-devfiles.yaml b/.github/workflows/validate-devfiles.yaml index 966a56b3..4b91e172 100644 --- a/.github/workflows/validate-devfiles.yaml +++ b/.github/workflows/validate-devfiles.yaml @@ -81,10 +81,7 @@ jobs: - name: Check odo version run: odo version - name: Check the devfile stacks with odo v3 - run: | - tests/check_odov3.sh \ - --skip="stack: java-openliberty" \ - --skip="stack: java-websphereliberty" \ + run: tests/check_odov3.sh odov2: name: with odo v2 diff --git a/stacks/dotnet50/devfile.yaml b/stacks/dotnet50/devfile.yaml index 40af6dd7..a84145b8 100644 --- a/stacks/dotnet50/devfile.yaml +++ b/stacks/dotnet50/devfile.yaml @@ -10,7 +10,7 @@ metadata: - .NET version: 1.0.3 starterProjects: - - name: dotnet-example + - name: dotnet50-example git: checkoutFrom: remote: origin diff --git a/stacks/dotnet60/devfile.yaml b/stacks/dotnet60/devfile.yaml index 009b352d..5abc87bf 100644 --- a/stacks/dotnet60/devfile.yaml +++ b/stacks/dotnet60/devfile.yaml @@ -10,7 +10,7 @@ metadata: - .NET version: 1.0.2 starterProjects: - - name: dotnet-example + - name: dotnet60-example git: checkoutFrom: remote: origin diff --git a/tests/check_odov3.sh b/tests/check_odov3.sh index 30a71e62..ec3367be 100755 --- a/tests/check_odov3.sh +++ b/tests/check_odov3.sh @@ -19,6 +19,8 @@ ginkgo run --procs 2 \ --skip="stack: java-websphereliberty-gradle starter: rest" \ --skip="stack: java-wildfly-bootable-jar" \ --skip="stack: java-wildfly" \ + --skip="stack: java-openliberty" \ + --skip="stack: java-websphereliberty" \ --slow-spec-threshold 120s \ --timeout 2h \ tests/odov3 -- -stacksDir "$(pwd)"/stacks