diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..a851e5e5a --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,2 @@ +# Global Owners +* @vparfonov @l0rd @rhopp @skabashnyuk diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index b54d5f900..000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,14 +0,0 @@ -### Description - - -### Reproduction Steps - - -**OS and version:** - -**Diagnostics:** - diff --git a/.github/ISSUE_TEMPLATE/where-to-report-issues.md b/.github/ISSUE_TEMPLATE/where-to-report-issues.md new file mode 100644 index 000000000..a00c1813c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/where-to-report-issues.md @@ -0,0 +1,16 @@ +--- +name: "⚠️ Where to report issues?" +about: File issues in the main Eclipse Che repository at https://github.com/eclipse/che/issues +title: Issues need to be filed in the main Eclipse Che repository +labels: '' +assignees: '' + +--- + +## Where to report issues? + +This repository is not the primary repository of Eclipse Che. + +🚨 Please don't submit new issues here. 🚨 + +All issues for Eclipse Che are managed at [https://github.com/eclipse/che/issues](https://github.com/eclipse/che/issues). diff --git a/README.md b/README.md index afc0a55d3..b6334f0d0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ [![Build Status](https://ci.centos.org/buildStatus/icon?job=devtools-che-devfile-registry-build-master/)](https://ci.centos.org/job/devtools-che-devfile-registry-build-master/) +[![Build Status](https://ci.centos.org/buildStatus/icon?job=devtools-che-devfile-registry-nightly/)](https://ci.centos.org/job/devtools-che-devfile-registry-nightly/) +[![Build Status](https://ci.centos.org/buildStatus/icon?job=devtools-che-devfile-registry-release/)](https://ci.centos.org/job/devtools-che-devfile-registry-release/) # Eclipse Che devfile registry @@ -8,7 +10,7 @@ This repository holds ready-to-use Devfiles for different languages and technolo Execute ```shell -docker build --no-cache -t openshiftio/che-devfile-registry . +docker build --no-cache -t quay.io/eclipse/che-devfile-registry:nightly . ``` Where `--no-cache` is needed to prevent usage of cached layers with devfile registry files. Useful when you change devfile files and rebuild the image. @@ -16,14 +18,14 @@ Useful when you change devfile files and rebuild the image. Note that the Dockerfiles feature multi-stage build, so it requires Docker of version 17.05 and higher. Though you may also just provide the image to the older versions of Docker (ex. on Minishift) by having it build on newer version, and pushing and pulling it from Docker Hub. -`quay.io/openshiftio/che-devfile-registry:latest` image would be rebuilt after each commit in master +`quay.io/eclipse/che-devfile-registry:nightly` image would be rebuilt after each commit in master. ## OpenShift You can deploy Che devfile registry on Openshift with command. ``` oc new-app -f deploy/openshift/che-devfile-registry.yaml \ - -p IMAGE="quay.io/openshiftio/che-devfile-registry" \ - -p IMAGE_TAG="latest" \ + -p IMAGE="quay.io/eclipse/che-devfile-registry" \ + -p IMAGE_TAG="nightly" \ -p PULL_POLICY="Always" ``` @@ -52,8 +54,9 @@ helm delete --purge che-devfile-registry ``` ## Docker + ``` -docker run -it --rm -p 8080:8080 quay.io/openshiftio/che-devfile-registry +docker run -it --rm -p 8080:8080 quay.io/eclipse/che-devfile-registry:nightly ``` ### License diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..af387699f --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +7.0.0-SNAPSHOT diff --git a/arbitrary-users-patch/Dockerfile b/arbitrary-users-patch/Dockerfile new file mode 100644 index 000000000..f0dc2b113 --- /dev/null +++ b/arbitrary-users-patch/Dockerfile @@ -0,0 +1,15 @@ +ARG FROM_IMAGE +FROM ${FROM_IMAGE} +USER 0 +# Set permissions on /etc/passwd and /home to allow arbitrary users to write +RUN mkdir -p /home/user +RUN chgrp -R 0 /home +RUN chmod -R g=u /etc/passwd /home +COPY [--chown=0:0] entrypoint.sh / +RUN chmod +x /entrypoint.sh + +USER 10001 +ENV HOME=/home/user +WORKDIR /projects +ENTRYPOINT [ "/entrypoint.sh" ] +CMD ["tail", "-f", "/dev/null"] diff --git a/arbitrary-users-patch/base_images b/arbitrary-users-patch/base_images new file mode 100644 index 000000000..50949526e --- /dev/null +++ b/arbitrary-users-patch/base_images @@ -0,0 +1,10 @@ +che-python-3.6 centos/python-36-centos7:1 +che-php-7 eclipse/php:7.1-che7 +che-golang-1.10 golang:1.10.7-stretch +che-java11-gradle gradle:5.2.1-jdk11 +che-java11-maven maven:3.6.0-jdk-11 +che-java8-maven maven:3.6.1-jdk-8 +che-dotnet-2.2 mcr.microsoft.com/dotnet/core/sdk:2.2-stretch +che-nodejs10-community node:10.16 +che-nodejs10-ubi registry.access.redhat.com/ubi8/nodejs-10 +che-nodejs8-centos registry.centos.org/che-stacks/centos-nodejs diff --git a/arbitrary-users-patch/build_images.sh b/arbitrary-users-patch/build_images.sh new file mode 100755 index 000000000..5d5cb629b --- /dev/null +++ b/arbitrary-users-patch/build_images.sh @@ -0,0 +1,39 @@ +#!/bin/bash +# +# Copyright (c) 2012-2018 Red Hat, Inc. +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# + +set -e + +SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd) + +DEFAULT_REGISTRY="quay.io" +DEFAULT_ORGANIZATION="eclipse" +DEFAULT_TAG="nightly" + +REGISTRY=${REGISTRY:-${DEFAULT_REGISTRY}} +ORGANIZATION=${ORGANIZATION:-${DEFAULT_ORGANIZATION}} +TAG=${TAG:-${DEFAULT_TAG}} + +NAME_FORMAT="${REGISTRY}/${ORGANIZATION}" + +PUSH_IMAGES=false +if [ "$1" == "--push" ]; then + PUSH_IMAGES=true +fi + +while read -r line; do + base_image_name=$(echo "$line" | tr -s ' ' | cut -f 1 -d ' ') + base_image=$(echo "$line" | tr -s ' ' | cut -f 2 -d ' ') + echo "Building ${NAME_FORMAT}/${base_image_name}:${TAG} based on $base_image ..." + docker build -t "${NAME_FORMAT}/${base_image_name}:${TAG}" --build-arg FROM_IMAGE="$base_image" "${SCRIPT_DIR}"/ + if ${PUSH_IMAGES}; then + echo "Pushing ${NAME_FORMAT}/${base_image_name}:${TAG}" to remote registry + docker push "${NAME_FORMAT}/${base_image_name}:${TAG}" + fi +done < "${SCRIPT_DIR}"/base_images diff --git a/arbitrary-users-patch/entrypoint.sh b/arbitrary-users-patch/entrypoint.sh new file mode 100644 index 000000000..8f02d0dd6 --- /dev/null +++ b/arbitrary-users-patch/entrypoint.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# Ensure $HOME exists when starting +if [ ! -d "${HOME}" ]; then + mkdir -p "${HOME}" +fi + +# Setup $PS1 for a consistent and reasonable prompt +if [ -w "${HOME}" ] && [ ! -f "${HOME}"/.bashrc ]; then + echo "PS1='\s-\v \w \$ '" > "${HOME}"/.bashrc +fi + +# Add current (arbitrary) user to /etc/passwd +if ! whoami &> /dev/null; then + if [ -w /etc/passwd ]; then + echo "${USER_NAME:-user}:x:$(id -u):0:${USER_NAME:-user} user:${HOME}:/bin/bash" >> /etc/passwd + fi +fi + +exec "$@" diff --git a/build.sh b/build.sh index f30a82248..3d940aab1 100755 --- a/build.sh +++ b/build.sh @@ -8,4 +8,4 @@ # SPDX-License-Identifier: EPL-2.0 # -docker build -t quay.io/openshiftio/che-devfile-registry:latest . +docker build -t quay.io/eclipse/che-devfile-registry:nightly . diff --git a/cico_build_ci.sh b/cico_build_ci.sh new file mode 100755 index 000000000..d73da9b75 --- /dev/null +++ b/cico_build_ci.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# +# Copyright (c) 2012-2019 Red Hat, Inc. +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# + +# Output command before executing +set -x + +# Exit on error +set -e + +SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd) +export SCRIPT_DIR + +# shellcheck disable=SC1090 +. "${SCRIPT_DIR}"/cico_functions.sh + +load_jenkins_vars +install_deps +set_ci_tag +build_and_push diff --git a/cico_build_nightly.sh b/cico_build_nightly.sh new file mode 100755 index 000000000..76103b712 --- /dev/null +++ b/cico_build_nightly.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# +# Copyright (c) 2012-2019 Red Hat, Inc. +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# + +# Output command before executing +set -x + +# Exit on error +set -e + +SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd) +export SCRIPT_DIR + +# shellcheck disable=SC1090 +. "${SCRIPT_DIR}"/cico_functions.sh + +load_jenkins_vars +install_deps +set_nightly_tag +build_and_push diff --git a/cico_build_release.sh b/cico_build_release.sh new file mode 100755 index 000000000..422a41ca1 --- /dev/null +++ b/cico_build_release.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# +# Copyright (c) 2012-2019 Red Hat, Inc. +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# + +# Output command before executing +set -x + +# Exit on error +set -e + +SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd) +export SCRIPT_DIR + +# shellcheck disable=SC1090 +. "${SCRIPT_DIR}"/cico_functions.sh + +load_jenkins_vars +install_deps +set_release_tag +build_and_push diff --git a/cico_build.sh b/cico_functions.sh old mode 100755 new mode 100644 similarity index 56% rename from cico_build.sh rename to cico_functions.sh index f7db4e926..84f0ddcaf --- a/cico_build.sh +++ b/cico_functions.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2012-2018 Red Hat, Inc. +# Copyright (c) 2012-2019 Red Hat, Inc. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -22,6 +22,8 @@ function load_jenkins_vars() { DEVSHIFT_TAG_LEN \ QUAY_USERNAME \ QUAY_PASSWORD \ + QUAY_ECLIPSE_CHE_USERNAME \ + QUAY_ECLIPSE_CHE_PASSWORD \ JENKINS_URL \ GIT_BRANCH \ GIT_COMMIT \ @@ -44,47 +46,66 @@ function install_deps() { git service docker start - echo 'CICO: Dependencies installed' } +function set_release_tag() { + # Let's obtain the tag based on the + # version defined in the 'VERSION' file + TAG=$(head -n 1 VERSION) + export TAG +} + +function set_ci_tag() { + # Let's obtain the tag based on the + # git commit hash + TAG=$(echo "$GIT_COMMIT" | cut -c1-"${DEVSHIFT_TAG_LEN}") + export TAG +} + +function set_nightly_tag() { + # Let's set the tag as nightly + export TAG="nightly" +} + function tag_push() { local TARGET=$1 docker tag "${IMAGE}" "$TARGET" docker push "$TARGET" } -function deploy() { +function build_and_push() { TARGET=${TARGET:-"centos"} REGISTRY="quay.io" if [ "$TARGET" == "rhel" ]; then DOCKERFILE="Dockerfile.rhel" + ORGANIZATION="openshiftio" IMAGE="rhel-che-devfile-registry" else DOCKERFILE="Dockerfile" + ORGANIZATION="eclipse" IMAGE="che-devfile-registry" + # For pushing to quay.io 'eclipse' organization we need to use different credentials + QUAY_USERNAME=${QUAY_ECLIPSE_CHE_USERNAME} + QUAY_PASSWORD=${QUAY_ECLIPSE_CHE_PASSWORD} fi if [ -n "${QUAY_USERNAME}" ] && [ -n "${QUAY_PASSWORD}" ]; then docker login -u "${QUAY_USERNAME}" -p "${QUAY_PASSWORD}" "${REGISTRY}" else - echo "Could not login, missing credentials for the registry" + echo "Could not login, missing credentials for pushing to the '${ORGANIZATION}' organization" fi - # Let's deploy - docker build -t ${IMAGE} -f ${DOCKERFILE} . - - TAG=$(echo "$GIT_COMMIT" | cut -c1-"${DEVSHIFT_TAG_LEN}") - - tag_push "${REGISTRY}/openshiftio/$IMAGE:$TAG" - tag_push "${REGISTRY}/openshiftio/$IMAGE:latest" - echo 'CICO: Image pushed, ready to update deployed app' -} + # Let's build and push arbitrary-user patched images only to 'eclipse' quay.io organization + # which is done as part of the 'centos' target execution + if [ "$TARGET" == "centos" ]; then + "${SCRIPT_DIR}"/arbitrary-users-patch/build_images.sh --push + echo "CICO: pushed '${TAG}' version of the arbitrary-user patched base images" + fi -function cico_setup() { - load_jenkins_vars; - install_deps; + # Let's build and push images to 'quay.io' + docker build -t ${IMAGE} -f ${DOCKERFILE} . + tag_push "${REGISTRY}/${ORGANIZATION}/${IMAGE}:${TAG}" + echo "CICO: '${TAG}' version of images pushed to '${REGISTRY}/${ORGANIZATION}' organization" } -cico_setup -deploy diff --git a/deploy/kubernetes/che-devfile-registry/templates/deployment.yaml b/deploy/kubernetes/che-devfile-registry/templates/deployment.yaml index b3842381d..d659a040b 100644 --- a/deploy/kubernetes/che-devfile-registry/templates/deployment.yaml +++ b/deploy/kubernetes/che-devfile-registry/templates/deployment.yaml @@ -7,7 +7,7 @@ # SPDX-License-Identifier: EPL-2.0 # -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -21,12 +21,9 @@ spec: app: che-devfile-registry strategy: type: RollingUpdate - rollingParams: - intervalSeconds: 1 + rollingUpdate: maxSurge: 25% maxUnavailable: 25% - timeoutSeconds: 600 - updatePeriodSeconds: 1 template: metadata: labels: diff --git a/deploy/kubernetes/che-devfile-registry/values.yaml b/deploy/kubernetes/che-devfile-registry/values.yaml index 6ac60b57e..0940e3e46 100644 --- a/deploy/kubernetes/che-devfile-registry/values.yaml +++ b/deploy/kubernetes/che-devfile-registry/values.yaml @@ -7,7 +7,7 @@ # SPDX-License-Identifier: EPL-2.0 # -cheDevfileRegistryImage: quay.io/openshiftio/che-devfile-registry +cheDevfileRegistryImage: quay.io/eclipse/che-devfile-registry:nightly cheDevfileRegistryImagePullPolicy: Always cheDevfileRegistryMemoryLimit: 256Mi #cheDevfileRegistryIngressSecretName: che-tls diff --git a/deploy/openshift/che-devfile-registry.yaml b/deploy/openshift/che-devfile-registry.yaml index 1a6c17e2f..64cf38ea9 100644 --- a/deploy/openshift/che-devfile-registry.yaml +++ b/deploy/openshift/che-devfile-registry.yaml @@ -83,13 +83,13 @@ objects: name: che-devfile-registry parameters: - name: IMAGE - value: quay.io/openshiftio/che-devfile-registry + value: quay.io/eclipse/che-devfile-registry displayName: Eclipse Che devfile registry image - description: Che devfile registry Docker image. Defaults to quay.io/openshiftio/che-devfile-registry + description: Che devfile registry Docker image. Defaults to quay.io/eclipse/che-devfile-registry - name: IMAGE_TAG - value: latest + value: nightly displayName: Eclipse Che devfile registry version - description: Eclipse Che devfile registry version which defaults to latest + description: Eclipse Che devfile registry version which defaults to nightly - name: MEMORY_LIMIT value: 256Mi displayName: Memory Limit diff --git a/devfiles/angular/devfile.yaml b/devfiles/angular/devfile.yaml index fdb475ef3..4c864a41a 100644 --- a/devfiles/angular/devfile.yaml +++ b/devfiles/angular/devfile.yaml @@ -15,14 +15,7 @@ components: - type: dockerimage alias: nodejs - image: node:10.16-alpine - command: ['tail'] - args: ['-f', '/dev/null'] - env: - - name: HOME - value: /projects - - name: PS1 - value: $(echo ${0})\\$ + image: quay.io/eclipse/che-nodejs10-community:nightly memoryLimit: 1Gi endpoints: - name: 'angular' diff --git a/devfiles/angular/meta.yaml b/devfiles/angular/meta.yaml index 49767c7a7..1a4150df3 100644 --- a/devfiles/angular/meta.yaml +++ b/devfiles/angular/meta.yaml @@ -1,6 +1,6 @@ --- displayName: NodeJS Angular Web Application -description: Devfile for developing NodeJS Angular Web Application -tags: ["NodeJS", "Theia", "Angular"] +description: Stack for developing NodeJS Angular Web Application +tags: ["NodeJS", "Angular", "Alpine"] icon: https://www.eclipse.org/che/images/logo-eclipseche.svg globalMemoryLimit: 2686Mi diff --git a/devfiles/apache-camel-springboot/devfile.yaml b/devfiles/apache-camel-springboot/devfile.yaml index 77afb5864..442b479cd 100644 --- a/devfiles/apache-camel-springboot/devfile.yaml +++ b/devfiles/apache-camel-springboot/devfile.yaml @@ -16,15 +16,15 @@ components: - type: chePlugin id: camel-tooling/vscode-apache-camel/latest + memoryLimit: 200Mi - type: chePlugin id: redhat/java/latest + memoryLimit: 1400Mi - type: dockerimage alias: maven - image: maven:3.6.1-jdk-8 - command: ['sleep'] - args: ['infinity'] + image: quay.io/eclipse/che-java8-maven:nightly env: - name: MAVEN_CONFIG value: "/home/user/.m2" @@ -40,10 +40,6 @@ components: value: "-XX:MaxRAMPercentage=50.0 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xms20m -Djava.security.egd=file:/dev/./urandom" - - name: PS1 - value: "$(echo ${0})\\$" - - name: HOME - value: "/home/user" volumes: - name: m2 containerPath: "/home/user/.m2" diff --git a/devfiles/apache-camel-springboot/meta.yaml b/devfiles/apache-camel-springboot/meta.yaml index 5eb282bba..0a5152ee7 100644 --- a/devfiles/apache-camel-springboot/meta.yaml +++ b/devfiles/apache-camel-springboot/meta.yaml @@ -1,6 +1,6 @@ --- -displayName: Apache Camel based projects on Che 7 -description: Stack with environment ready to develop Integration projects with Apache Camel based on SpringBoot. -tags: ["Java", "OpenJDK", "Maven", "Debian", "Apache Camel", "Red Hat Fuse"] +displayName: Apache Camel based on Spring Boot +description: Stack with environment ready to develop Integration projects with Apache Camel based on Spring Boot. +tags: ["Java", "OpenJDK", "Maven", "Debian", "Apache Camel", "Red Hat Fuse", "Spring Boot"] icon: https://www.eclipse.org/che/images/logo-eclipseche.svg globalMemoryLimit: 2930Mi diff --git a/devfiles/dotnet/devfile.yaml b/devfiles/dotnet/devfile.yaml index 5be164f68..6b28d8c0c 100644 --- a/devfiles/dotnet/devfile.yaml +++ b/devfiles/dotnet/devfile.yaml @@ -20,14 +20,7 @@ components: - type: dockerimage alias: dotnet - image: mcr.microsoft.com/dotnet/core/sdk:2.2-stretch - command: ['sleep'] - args: ['infinity'] - env: - - name: HOME - value: /home/user - - name: PS1 - value: $(echo ${0})\\$ + image: quay.io/eclipse/che-dotnet-2.2:nightly memoryLimit: 512Mi endpoints: - name: '5000/tcp' diff --git a/devfiles/dotnet/meta.yaml b/devfiles/dotnet/meta.yaml index 568f38790..2e9c5ebf6 100644 --- a/devfiles/dotnet/meta.yaml +++ b/devfiles/dotnet/meta.yaml @@ -1,6 +1,6 @@ --- -displayName: ".NET Core with Theia IDE" -description: Default stack with .Net 2.2.105 and Theia IDE -tags: ["Theia", "Debian", "Dotnet", "C#"] +displayName: ".NET Core" +description: Stack with .Net 2.2 +tags: ["Debian", "Dotnet", "C#"] icon: https://www.eclipse.org/che/images/logo-eclipseche.svg globalMemoryLimit: 2710Mi diff --git a/devfiles/go/devfile.yaml b/devfiles/go/devfile.yaml index 40fa0feec..ca84874f5 100644 --- a/devfiles/go/devfile.yaml +++ b/devfiles/go/devfile.yaml @@ -2,22 +2,45 @@ apiVersion: 1.0.0 metadata: name: golang +projects: +- + name: example + source: + type: git + location: https://github.com/golang/example.git + clonePath: src/github.com/golang/example/ components: - - - type: chePlugin - id: ms-vscode/go/latest - memoryLimit: 512Mi - - - type: dockerimage - image: golang:1.12.4-stretch - command: ['sleep'] - args: ['infinity'] - env: - - name: GOPATH - value: /go:/projects - - name: GOCACHE - value: /tmp/.cache - - name: PS1 - value: $(echo ${0})\\$ - memoryLimit: 512Mi - mountSources: true +- + type: chePlugin + id: ms-vscode/go/latest + alias: go-plugin + memoryLimit: 512Mi +- + type: dockerimage + # this version is used in the plugin + image: quay.io/eclipse/che-golang-1.10:nightly + alias: go-cli + env: + - name: GOPATH + # replicate the GOPATH from the plugin + value: /go:$(CHE_PROJECTS_ROOT) + - name: GOCACHE + # replicate the GOCACHE from the plugin, even though the cache is not shared + # between the two + value: /tmp/.cache + memoryLimit: 512Mi + mountSources: true +commands: +- + name: run outyet + actions: + - type: exec + component: go-cli + command: go get -d && go run main.go + workdir: ${CHE_PROJECTS_ROOT}/src/github.com/golang/example/outyet +- name: test outyet + actions: + - type: exec + component: go-cli + command: go test + workdir: ${CHE_PROJECTS_ROOT}/src/github.com/golang/example/outyet diff --git a/devfiles/go/meta.yaml b/devfiles/go/meta.yaml index b8ed9ecdb..067cf04d8 100644 --- a/devfiles/go/meta.yaml +++ b/devfiles/go/meta.yaml @@ -1,6 +1,6 @@ --- -displayName: Go with Theia IDE -description: Default stack with Go 1.12.4 and Theia IDE -tags: ["Theia", "Debian", "Go"] +displayName: Go +description: Stack with Go 1.10.7 +tags: ["Debian", "Go"] icon: https://www.eclipse.org/che/images/logo-eclipseche.svg globalMemoryLimit: 1686Mi diff --git a/devfiles/java-gradle/devfile.yaml b/devfiles/java-gradle/devfile.yaml index 374124680..37ebe8fc4 100644 --- a/devfiles/java-gradle/devfile.yaml +++ b/devfiles/java-gradle/devfile.yaml @@ -15,9 +15,7 @@ components: - type: dockerimage alias: gradle - image: gradle:5.2.1-jdk11 - command: ['sleep'] - args: ['infinity'] + image: quay.io/eclipse/che-java11-gradle:nightly env: - name: GRADLE_USER_HOME value: /home/gradle/.gradle @@ -29,8 +27,6 @@ components: value: "-XX:MaxRAMPercentage=50 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xms20m -Djava.security.egd=file:/dev/./urandom" - - name: PS1 - value: "$(echo ${0})\\$ " - name: HOME value: /home/gradle memoryLimit: 512Mi diff --git a/devfiles/java-gradle/meta.yaml b/devfiles/java-gradle/meta.yaml index 66c99b88b..114e5c644 100644 --- a/devfiles/java-gradle/meta.yaml +++ b/devfiles/java-gradle/meta.yaml @@ -1,6 +1,6 @@ --- displayName: Java Gradle description: Java Stack with OpenJDK 11 and Gradle 5.2.1 -tags: ["Java", "OpenJDK", "Gradle", "Spring Boot v2", "Debian"] +tags: ["Java", "OpenJDK", "Gradle", "Ubuntu"] icon: https://www.eclipse.org/che/images/logo-eclipseche.svg globalMemoryLimit: 2674Mi diff --git a/devfiles/java-maven/devfile.yaml b/devfiles/java-maven/devfile.yaml index 51c0488d0..6c8c5e40b 100644 --- a/devfiles/java-maven/devfile.yaml +++ b/devfiles/java-maven/devfile.yaml @@ -15,9 +15,7 @@ components: - type: dockerimage alias: maven - image: maven:3.6.0-jdk-11 - command: ['sleep'] - args: ['infinity'] + image: quay.io/eclipse/che-java11-maven:nightly env: - name: MAVEN_CONFIG value: /home/user/.m2 @@ -34,10 +32,6 @@ components: value: "-XX:MaxRAMPercentage=50 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xms20m -Djava.security.egd=file:/dev/./urandom" - - name: PS1 - value: $(echo ${0})\\$ - - name: HOME - value: /home/user memoryLimit: 512Mi endpoints: - name: '8080/tcp' diff --git a/devfiles/java-maven/meta.yaml b/devfiles/java-maven/meta.yaml index 3313163ad..fe447828e 100644 --- a/devfiles/java-maven/meta.yaml +++ b/devfiles/java-maven/meta.yaml @@ -1,6 +1,6 @@ --- displayName: Java Maven -description: Default Java Stack with OpenJDK 11 and Maven 3.6 -tags: ["Java", "OpenJDK", "Maven", "Spring Boot v2", "Vert.x", "Debian"] +description: Java Stack with OpenJDK 11 and Maven 3.6.0 +tags: ["Java", "OpenJDK", "Maven", "Debian"] icon: https://www.eclipse.org/che/images/logo-eclipseche.svg globalMemoryLimit: 2674Mi diff --git a/devfiles/java-mysql/devfile.yaml b/devfiles/java-mysql/devfile.yaml new file mode 100644 index 000000000..c086d0bad --- /dev/null +++ b/devfiles/java-mysql/devfile.yaml @@ -0,0 +1,72 @@ +--- +apiVersion: 1.0.0 +metadata: + name: java-mysql +projects: + - + name: web-java-spring-petclinic + source: + type: git + location: "https://github.com/spring-projects/spring-petclinic.git" +components: + - + type: chePlugin + id: redhat/java/latest + - + type: dockerimage + alias: tools + image: quay.io/eclipse/che-java8-maven:nightly + env: + - name: JAVA_OPTS + value: "-XX:MaxRAMPercentage=50.0 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 + -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 + -Dsun.zip.disableMemoryMapping=true -Xms20m -Djava.security.egd=file:/dev/./urandom + -Duser.home=/home/user" + - name: MAVEN_OPTS + value: $(JAVA_OPTS) + memoryLimit: 700Mi + endpoints: + - name: '8080/tcp' + port: 8080 + mountSources: true + volumes: + - name: m2 + containerPath: /home/user/.m2 + - + type: dockerimage + alias: mysql + image: centos/mysql-57-centos7 + env: + - name: MYSQL_USER + value: petclinic + - name: MYSQL_PASSWORD + value: password + - name: MYSQL_DATABASE + value: petclinic + - name: PS1 + value: $(echo ${0})\\$ + memoryLimit: 256Mi + endpoints: + - name: 'db' + port: 3306 + attributes: + discoverable: "true" + public: "false" + mountSources: false +commands: + - + name: maven build + actions: + - + type: exec + component: tools + command: "mvn clean install" + workdir: "${CHE_PROJECTS_ROOT}/web-java-spring-petclinic" + - name: run webapp + actions: + - + type: exec + component: tools + command: | + SPRING_DATASOURCE_URL=jdbc:mysql://db/petclinic SPRING_DATASOURCE_USERNAME=petclinic SPRING_DATASOURCE_PASSWORD=password java -jar target/*.jar --spring.profile.active=mysql + workdir: ${CHE_PROJECTS_ROOT}/web-java-spring-petclinic diff --git a/devfiles/java-mysql/meta.yaml b/devfiles/java-mysql/meta.yaml new file mode 100644 index 000000000..285520748 --- /dev/null +++ b/devfiles/java-mysql/meta.yaml @@ -0,0 +1,6 @@ +--- +displayName: Java with Spring Boot and MySQL +description: Java stack with OpenJDK 8, MySQL and Spring Boot Petclinic demo application +tags: ["Java", "OpenJDK", "Maven", "Spring Boot", "MySQL"] +icon: https://www.eclipse.org/che/images/logo-eclipseche.svg +globalMemoryLimit: 2930Mi diff --git a/devfiles/java-web-spring/devfile.yaml b/devfiles/java-web-spring/devfile.yaml new file mode 100644 index 000000000..bef22a5cb --- /dev/null +++ b/devfiles/java-web-spring/devfile.yaml @@ -0,0 +1,50 @@ +--- +apiVersion: 1.0.0 +metadata: + name: java-web-spring +projects: + - + name: java-web-spring + source: + type: git + location: "https://github.com/spring-projects/spring-petclinic.git" +components: + - + type: chePlugin + id: redhat/java/latest + - + type: dockerimage + alias: tools + image: quay.io/eclipse/che-java8-maven:nightly + env: + - name: JAVA_OPTS + value: "-XX:MaxRAMPercentage=50.0 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 + -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 + -Dsun.zip.disableMemoryMapping=true -Xms20m -Djava.security.egd=file:/dev/./urandom + -Duser.home=/home/user" + - name: MAVEN_OPTS + value: $(JAVA_OPTS) + memoryLimit: 1024Mi + endpoints: + - name: '8080/tcp' + port: 8080 + mountSources: true + volumes: + - name: m2 + containerPath: /home/user/.m2 +commands: + - + name: maven build + actions: + - + type: exec + component: tools + command: "mvn clean install" + workdir: ${CHE_PROJECTS_ROOT}/java-web-spring + - name: run webapp + actions: + - + type: exec + component: tools + command: "java -jar target/*.jar" + workdir: ${CHE_PROJECTS_ROOT}/java-web-spring diff --git a/devfiles/java-web-spring/meta.yaml b/devfiles/java-web-spring/meta.yaml new file mode 100644 index 000000000..b3b0d9c39 --- /dev/null +++ b/devfiles/java-web-spring/meta.yaml @@ -0,0 +1,6 @@ +--- +displayName: Java Spring Boot +description: Java stack with OpenJDK 8 and Spring Boot Petclinic demo application +tags: ["Java", "OpenJDK", "Maven", "Spring Boot"] +icon: https://www.eclipse.org/che/images/logo-eclipseche.svg +globalMemoryLimit: 2674Mi diff --git a/devfiles/java-web-vertx/devfile.yaml b/devfiles/java-web-vertx/devfile.yaml new file mode 100644 index 000000000..7354e94aa --- /dev/null +++ b/devfiles/java-web-vertx/devfile.yaml @@ -0,0 +1,51 @@ +--- +apiVersion: 1.0.0 +metadata: + name: java-web-vertx +projects: + - + name: java-web-vertx + source: + type: git + location: "https://github.com/che-samples/web-java-vertx" +components: + - + type: chePlugin + id: redhat/java/latest + - + type: dockerimage + alias: maven + image: quay.io/eclipse/che-java8-maven:nightly + env: + - name: JAVA_OPTS + value: "-XX:MaxRAMPercentage=50.0 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 + -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 + -Dsun.zip.disableMemoryMapping=true -Xms20m -Djava.security.egd=file:/dev/./urandom + -Duser.home=/home/user" + - name: MAVEN_OPTS + value: $(JAVA_OPTS) + memoryLimit: 512Mi + endpoints: + - name: '8080/tcp' + port: 8080 + mountSources: true + volumes: + - name: m2 + containerPath: /home/user/.m2 +commands: + - + name: maven build + actions: + - + type: exec + component: maven + command: "mvn -Duser.home=${HOME} clean install" + workdir: "${CHE_PROJECTS_ROOT}/java-web-vertx" + - + name: run app + actions: + - + type: exec + component: maven + command: "JDBC_URL=jdbc:h2:/tmp/db java -jar ./target/*fat.jar" + workdir: "${CHE_PROJECTS_ROOT}/java-web-vertx" diff --git a/devfiles/java-web-vertx/meta.yaml b/devfiles/java-web-vertx/meta.yaml new file mode 100644 index 000000000..4cbbac65c --- /dev/null +++ b/devfiles/java-web-vertx/meta.yaml @@ -0,0 +1,6 @@ +--- +displayName: Java Vert.x +description: Java stack with OpenJDK 8 and Vert.x demo application +tags: ["Java", "OpenJDK", "Maven", "Vertx"] +icon: https://www.eclipse.org/che/images/logo-eclipseche.svg +globalMemoryLimit: 2674Mi diff --git a/devfiles/nodejs-mongo/devfile.yaml b/devfiles/nodejs-mongo/devfile.yaml new file mode 100644 index 000000000..22616b559 --- /dev/null +++ b/devfiles/nodejs-mongo/devfile.yaml @@ -0,0 +1,70 @@ +--- +apiVersion: 1.0.0 +metadata: + name: nodejs-mongo +projects: + - + name: nodejs-mongodb-app + source: + type: git + location: "https://github.com/gothinkster/node-express-realworld-example-app" +components: + - + type: chePlugin + id: che-incubator/typescript/latest + memoryLimit: 512Mi + - + type: dockerimage + alias: nodejs + image: quay.io/eclipse/che-nodejs10-ubi:nightly + env: + # The values below are used to set up the environment for running the application + - name: SECRET + value: 220fd770-c028-480d-8f95-f84353c7d55a + - name: NODE_ENV + value: production + - name: MONGODB_URI + value: mongodb://user:password@mongo/db + memoryLimit: 512Mi + endpoints: + - name: 'nodejs' + port: 3000 + mountSources: true + - + type: dockerimage + alias: mongo + image: centos/mongodb-34-centos7 + memoryLimit: 512Mi + env: + - name: MONGODB_USER + value: user + - name: MONGODB_PASSWORD + value: password + - name: MONGODB_DATABASE + value: db + - name: MONGODB_ADMIN_PASSWORD + value: password + volumes: + - name: mongo-storage + containerPath: /var/lib/mongodb/data + endpoints: + - name: mongo + port: 27017 + attributes: + discoverable: 'true' + public: 'false' +commands: + - + name: run the web app + actions: + - type: exec + component: nodejs + command: npm install && npm run dev + workdir: ${CHE_PROJECTS_ROOT}/nodejs-mongodb-app + - + name: create test user + actions: + - type: exec + component: nodejs + command: | + curl -X POST --data '{"user": {"username": "test", "email": "test@test.com", "password": "password"}}' -H "Content-Type: application/json" http://localhost:3000/api/users diff --git a/devfiles/nodejs-mongo/meta.yaml b/devfiles/nodejs-mongo/meta.yaml new file mode 100644 index 000000000..519b6e083 --- /dev/null +++ b/devfiles/nodejs-mongo/meta.yaml @@ -0,0 +1,6 @@ +--- +displayName: NodeJS MongoDB Web Application +description: Stack with NodeJS 10 and MongoDB 3.4 +tags: ["NodeJS", "Express", "MongoDB", "RealWorld", "ubi8", "Centos"] +icon: https://www.eclipse.org/che/images/logo-eclipseche.svg +globalMemoryLimit: 1686Mi diff --git a/devfiles/nodejs-react/devfile.yaml b/devfiles/nodejs-react/devfile.yaml new file mode 100644 index 000000000..7b559d603 --- /dev/null +++ b/devfiles/nodejs-react/devfile.yaml @@ -0,0 +1,41 @@ +--- +apiVersion: 1.0.0 +metadata: + name: react +projects: + - + name: react-redux-realworld-example-app + source: + type: git + location: "https://github.com/gothinkster/react-redux-realworld-example-app" +components: + - + type: chePlugin + id: che-incubator/typescript/latest + memoryLimit: 512Mi + - + type: dockerimage + alias: nodejs + # system limit for number of file watchers reached with + # image: registry.access.redhat.com/ubi8/nodejs-10 + image: quay.io/eclipse/che-nodejs8-centos:nightly + memoryLimit: 512Mi + endpoints: + - name: 'nodejs' + port: 4100 + mountSources: true +commands: + - + name: install all required dependencies + actions: + - type: exec + component: nodejs + command: npm install + workdir: ${CHE_PROJECTS_ROOT}/react-redux-realworld-example-app + - + name: start the local server + actions: + - type: exec + component: nodejs + command: npm start + workdir: ${CHE_PROJECTS_ROOT}/react-redux-realworld-example-app diff --git a/devfiles/nodejs-react/meta.yaml b/devfiles/nodejs-react/meta.yaml new file mode 100644 index 000000000..a1ea1eb05 --- /dev/null +++ b/devfiles/nodejs-react/meta.yaml @@ -0,0 +1,6 @@ +--- +displayName: NodeJS React Web Application +description: Stack for developing NodeJS React Web Application +tags: ["NodeJS", "React", "Redux", "RealWorld"] +icon: https://www.eclipse.org/che/images/logo-eclipseche.svg +globalMemoryLimit: 1686Mi diff --git a/devfiles/nodejs/devfile.yaml b/devfiles/nodejs/devfile.yaml index d1d316e8f..80a9c8ec9 100644 --- a/devfiles/nodejs/devfile.yaml +++ b/devfiles/nodejs/devfile.yaml @@ -16,14 +16,7 @@ components: - type: dockerimage alias: nodejs - image: registry.access.redhat.com/ubi8/nodejs-10 - command: ['sleep'] - args: ['infinity'] - env: - - name: HOME - value: /home/user - - name: PS1 - value: $(echo ${0})\\$ + image: quay.io/eclipse/che-nodejs10-ubi:nightly memoryLimit: 512Mi endpoints: - name: 'nodejs' diff --git a/devfiles/nodejs/meta.yaml b/devfiles/nodejs/meta.yaml index fc06d16f8..4d61d32d5 100644 --- a/devfiles/nodejs/meta.yaml +++ b/devfiles/nodejs/meta.yaml @@ -1,6 +1,6 @@ --- displayName: NodeJS Express Web Application -description: Default stack with NodeJS 10 -tags: ["NodeJS", "Express", "Theia", "ubi8"] +description: Stack with NodeJS 10 +tags: ["NodeJS", "Express", "ubi8"] icon: https://www.eclipse.org/che/images/logo-eclipseche.svg globalMemoryLimit: 1686Mi diff --git a/devfiles/php-laravel/devfile.yaml b/devfiles/php-laravel/devfile.yaml index 54219c9b3..e7c090c86 100644 --- a/devfiles/php-laravel/devfile.yaml +++ b/devfiles/php-laravel/devfile.yaml @@ -20,12 +20,7 @@ components: - type: dockerimage alias: php - image: eclipse/php:7.1-che7 - env: - - name: HOME - value: /home/user - - name: PS1 - value: $(echo ${0})\\$ + image: quay.io/eclipse/che-php-7:nightly memoryLimit: 512Mi endpoints: - name: '8080/tcp' diff --git a/devfiles/php-laravel/meta.yaml b/devfiles/php-laravel/meta.yaml index 545398206..491bcd8f6 100644 --- a/devfiles/php-laravel/meta.yaml +++ b/devfiles/php-laravel/meta.yaml @@ -1,6 +1,6 @@ --- -displayName: "PHP Laravel" -description: PHP Stack with Laravel real world application -tags: ["PHP", "Apache", "MySQL"] +displayName: "PHP Laravel with MySQL" +description: PHP Stack with Laravel and MySQL real world application +tags: ["PHP", "Apache", "MySQL", "Centos", "Debian"] icon: https://www.eclipse.org/che/images/logo-eclipseche.svg globalMemoryLimit: 2686Mi diff --git a/devfiles/php-mysql/devfile.yaml b/devfiles/php-mysql/devfile.yaml index cd27b27ed..56a51d65e 100644 --- a/devfiles/php-mysql/devfile.yaml +++ b/devfiles/php-mysql/devfile.yaml @@ -20,12 +20,7 @@ components: - type: dockerimage alias: php - image: eclipse/php:7.1-che7 - env: - - name: HOME - value: /home/user - - name: PS1 - value: $(echo ${0})\\$ + image: quay.io/eclipse/che-php-7:nightly memoryLimit: 512Mi endpoints: - name: '8080/tcp' diff --git a/devfiles/php-mysql/meta.yaml b/devfiles/php-mysql/meta.yaml index 632fb8212..af7c6eea4 100644 --- a/devfiles/php-mysql/meta.yaml +++ b/devfiles/php-mysql/meta.yaml @@ -1,6 +1,6 @@ --- -displayName: "PHP MySQL" +displayName: "PHP with MySQL" description: PHP Stack with MySQL and simple database application -tags: ["PHP", "Apache", "MySQL"] +tags: ["PHP", "Apache", "MySQL", "Debian", "Centos"] icon: https://www.eclipse.org/che/images/logo-eclipseche.svg globalMemoryLimit: 2686Mi diff --git a/devfiles/php-symfony/devfile.yaml b/devfiles/php-symfony/devfile.yaml index 85a8891c4..01a0f80d8 100644 --- a/devfiles/php-symfony/devfile.yaml +++ b/devfiles/php-symfony/devfile.yaml @@ -20,12 +20,7 @@ components: - type: dockerimage alias: php - image: eclipse/php:7.1-che7 - env: - - name: HOME - value: /home/user - - name: PS1 - value: $(echo ${0})\\$ + image: quay.io/eclipse/che-php-7:nightly memoryLimit: 512Mi endpoints: - name: '8080/tcp' diff --git a/devfiles/php-symfony/meta.yaml b/devfiles/php-symfony/meta.yaml index 741bdef64..f32b7d7de 100644 --- a/devfiles/php-symfony/meta.yaml +++ b/devfiles/php-symfony/meta.yaml @@ -1,6 +1,6 @@ --- displayName: "PHP Symfony" description: PHP Stack with Symfony Demo Application https://symfony.com/ -tags: ["PHP", "Apache", "MySQL", "Symfony"] +tags: ["PHP", "Apache", "MySQL", "Symfony", "Debian", "Centos"] icon: https://www.eclipse.org/che/images/logo-eclipseche.svg globalMemoryLimit: 2686Mi diff --git a/devfiles/php-web-simple/devfile.yaml b/devfiles/php-web-simple/devfile.yaml index 76989a9c1..167c1d592 100644 --- a/devfiles/php-web-simple/devfile.yaml +++ b/devfiles/php-web-simple/devfile.yaml @@ -20,12 +20,7 @@ components: - type: dockerimage alias: php - image: eclipse/php:7.1-che7 - env: - - name: HOME - value: /home/user - - name: PS1 - value: $(echo ${0})\\$ + image: quay.io/eclipse/che-php-7:nightly memoryLimit: 512Mi mountSources: true volumes: diff --git a/devfiles/php-web-simple/meta.yaml b/devfiles/php-web-simple/meta.yaml index 5ec29a9f4..eef699a27 100644 --- a/devfiles/php-web-simple/meta.yaml +++ b/devfiles/php-web-simple/meta.yaml @@ -1,6 +1,6 @@ --- displayName: "PHP Simple" description: PHP Stack with PHP 7.1 and simple web application -tags: ["PHP", "Apache"] +tags: ["PHP", "Apache", "Debian"] icon: https://www.eclipse.org/che/images/logo-eclipseche.svg globalMemoryLimit: 2430Mi diff --git a/devfiles/python-django/devfile.yaml b/devfiles/python-django/devfile.yaml index b8270abf4..80a72332a 100644 --- a/devfiles/python-django/devfile.yaml +++ b/devfiles/python-django/devfile.yaml @@ -7,7 +7,7 @@ projects: name: django-realworld-example-app source: type: git - location: "https://github.com/gothinkster/django-realworld-example-app" + location: "https://github.com/che-samples/django-realworld-example-app" components: - type: chePlugin @@ -16,14 +16,7 @@ components: - type: dockerimage alias: python - image: centos/python-36-centos7:1 - command: ['sleep'] - args: ['infinity'] - env: - - name: HOME - value: /home/user - - name: PS1 - value: $(echo ${0})\\$ + image: quay.io/eclipse/che-python-3.6:nightly memoryLimit: 512Mi endpoints: - name: 'django' @@ -31,12 +24,12 @@ components: mountSources: true commands: - - name: install requirements + name: install dependencies actions: - type: exec component: python - command: pip install -r requirements.txt + command: pip install -r requirements.txt && pip install ptvsd workdir: ${CHE_PROJECTS_ROOT}/django-realworld-example-app - name: migrate @@ -45,20 +38,42 @@ commands: type: exec component: python command: python manage.py migrate - workdir: cd ${CHE_PROJECTS_ROOT}/django-realworld-example-app + workdir: ${CHE_PROJECTS_ROOT}/django-realworld-example-app - - name: patch resources + name: run server actions: - type: exec component: python - command: sed -i "s/ALLOWED_HOSTS = \[\]/ALLOWED_HOSTS = \['*'\]/g" conduit/settings.py + command: export DEBUG_MODE=False && python manage.py runserver 0.0.0.0:7000 workdir: ${CHE_PROJECTS_ROOT}/django-realworld-example-app - - name: run server + name: run server in debug mode actions: - type: exec component: python - command: python manage.py runserver 0.0.0.0:7000 + command: export DEBUG_MODE=True && python manage.py runserver 0.0.0.0:7000 --noreload --nothreading workdir: ${CHE_PROJECTS_ROOT}/django-realworld-example-app + - + name: debug + actions: + - type: vscode-launch + referenceContent: > + { + "version": "0.2.0", + "configurations": [ + { + "name": "Python: Remote Attach", + "type": "python", + "request": "attach", + "port": 5678, + "host": "0.0.0.0", + "pathMappings": [ + { + "localRoot": "${workspaceFolder}", + "remoteRoot": "${workspaceFolder}" + } + ] + }] + } diff --git a/devfiles/python-django/meta.yaml b/devfiles/python-django/meta.yaml index 9d7d9f4e0..f9483565a 100644 --- a/devfiles/python-django/meta.yaml +++ b/devfiles/python-django/meta.yaml @@ -1,6 +1,6 @@ --- -displayName: Python with Theia IDE -description: Default stack with Python 3.7 and Theia IDE adapted to work with Django -tags: ["Theia", "Debian", "Python", "pip"] +displayName: Django +description: Stack with Python 3.6 and Django +tags: ["Centos", "Python", "pip"] icon: https://www.eclipse.org/che/images/logo-eclipseche.svg globalMemoryLimit: 1686Mi diff --git a/devfiles/python/devfile.yaml b/devfiles/python/devfile.yaml index 795da17c4..059d860ac 100644 --- a/devfiles/python/devfile.yaml +++ b/devfiles/python/devfile.yaml @@ -16,14 +16,7 @@ components: - type: dockerimage alias: python - image: centos/python-36-centos7:1 - command: ['sleep'] - args: ['infinity'] - env: - - name: HOME - value: /home/user - - name: PS1 - value: $(echo ${0})\\$ + image: quay.io/eclipse/che-python-3.6:nightly memoryLimit: 512Mi mountSources: true commands: diff --git a/devfiles/python/meta.yaml b/devfiles/python/meta.yaml index ca517a3c9..81c08ecee 100644 --- a/devfiles/python/meta.yaml +++ b/devfiles/python/meta.yaml @@ -1,6 +1,6 @@ --- -displayName: Python with Theia IDE -description: Default stack with Python 3.7 and Theia IDE -tags: ["Theia", "Debian", "Python", "pip"] +displayName: Python +description: Stack with Python 3.6 +tags: ["Centos", "Python", "pip"] icon: https://www.eclipse.org/che/images/logo-eclipseche.svg globalMemoryLimit: 1686Mi