Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to the upstream #18

Merged
merged 10 commits into from
Jan 4, 2020
57 changes: 57 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: CI

on:
pull_request:
branches:
- master

jobs:
shellcheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1

- name: Shellcheck
run: |
find . -type f -name '*.sh' | wc -l
find . -type f -name '*.sh' | xargs shellcheck --external-sources
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1

- name: Cache docker layers
uses: actions/cache@v1
with:
path: ./caches
key: v1-${{ github.head_ref }}

- name: Load docker layer cache
run: |
set +o pipefail
docker load -i ./caches/app.tar | true

- name: Build devfile registry
run: |
docker build \
--cache-from=app \
-t app \
-f ./build/dockerfiles/Dockerfile \
--target registry .

- name: Cache docker layers
run: |
mkdir -p ./caches
docker save -o ./caches/app.tar app

- name: Build offline devfile registry
run: |
docker build \
--cache-from=app \
-t app \
-f ./build/dockerfiles/Dockerfile \
--target offline-registry .


2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.6.0-SNAPSHOT
7.7.0-SNAPSHOT
4 changes: 3 additions & 1 deletion arbitrary-users-patch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ ARG FROM_IMAGE
FROM ${FROM_IMAGE}
USER 0
# Set permissions on /etc/passwd and /home to allow arbitrary users to write
COPY [--chown=0:0] entrypoint.sh /
COPY --chown=0:0 entrypoint.sh /
RUN mkdir -p /home/user && chgrp -R 0 /home && chmod -R g=u /etc/passwd /home && chmod +x /entrypoint.sh

USER 10001
ENV HOME=/home/user
WORKDIR /projects
ENTRYPOINT [ "/entrypoint.sh" ]
CMD ["tail", "-f", "/dev/null"]

LABEL "che.base.image" ${FROM_IMAGE}
Empty file modified arbitrary-users-patch/entrypoint.sh
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ data:
CHE_DEVFILE_IMAGES_REGISTRY_URL: {{ .Values.cheDevfileImagesOverride.url }}
CHE_DEVFILE_IMAGES_REGISTRY_ORGANIZATION: {{ .Values.cheDevfileImagesOverride.organization }}
CHE_DEVFILE_IMAGES_REGISTRY_TAG: {{ .Values.cheDevfileImagesOverride.tag }}
CHE_DEVFILE_REGISTRY_URL: http{{- if .Values.cheDevfileRegistryIngressSecretName -}}s{{- end -}}{{- printf "://che-devfile-registry-%s.%s" .Release.Namespace .Values.global.ingressDomain }}
4 changes: 2 additions & 2 deletions devfiles/apache-camel-springboot/devfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ components:
-
type: chePlugin
id: redhat/vscode-apache-camel/latest
memoryLimit: 200Mi
memoryLimit: 260Mi
-
type: chePlugin
id: redhat/java/latest
memoryLimit: 1400Mi
memoryLimit: 1360Mi
-
type: dockerimage
alias: maven
Expand Down
6 changes: 3 additions & 3 deletions devfiles/che4z/devfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ components:
type: chePlugin
id: broadcommfd/explorer-for-endevor/latest
-
id: eclipse/che-machine-exec-plugin/7.3.0
type: chePlugin
id: broadcommfd/debugger-for-mainframe/latest
-
id: eclipse/che-theia/7.3.0
type: cheEditor
type: chePlugin
id: broadcommfd/hlasm-language-support/latest
-
alias: zowe-cli
type: kubernetes
Expand Down
2 changes: 1 addition & 1 deletion devfiles/che4z/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
displayName: Mainframe Basic Stack
description: Mainframe Basic Stack
tags: ["Che4z", "Zowe", "mainframe", "Endevor", "explorer", "dataset", "COBOL", "JCL", "zOS", "USS"]
tags: ["Che4z", "Zowe", "mainframe", "Endevor", "explorer", "dataset", "COBOL", "JCL", "zOS", "USS", "HLASM", "InterTest", "debug"]
icon: https://www.eclipse.org/che/images/logo-eclipseche.svg
globalMemoryLimit: 2280Mi
53 changes: 53 additions & 0 deletions devfiles/nodejs-yarn/devfile.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
---
apiVersion: 1.0.0
metadata:
generateName: nodejs-web-app-
projects:
-
name: react-web-app
source:
type: git
location: "https://github.com/che-samples/react-web-app.git"
components:
-
type: chePlugin
id: che-incubator/typescript/latest
memoryLimit: 512Mi
-
type: dockerimage
alias: nodejs
image: quay.io/eclipse/che-nodejs10-community:nightly
memoryLimit: 1Gi
endpoints:
- name: 'nodejs'
port: 3000
mountSources: true
commands:
-
name: install all required dependencies
actions:
- type: exec
component: nodejs
command: yarn install
workdir: ${CHE_PROJECTS_ROOT}/react-web-app
-
name: build the app
actions:
- type: exec
component: nodejs
command: yarn build
workdir: ${CHE_PROJECTS_ROOT}/react-web-app
-
name: run the app
actions:
- type: exec
component: nodejs
command: yarn start
workdir: ${CHE_PROJECTS_ROOT}/react-web-app
-
name: launch tests
actions:
- type: exec
component: nodejs
command: yarn test
workdir: ${CHE_PROJECTS_ROOT}/react-web-app
6 changes: 6 additions & 0 deletions devfiles/nodejs-yarn/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
displayName: NodeJS Web Application based on Yarn
description: Stack for developing NodeJS Web Application based on Yarn
tags: ["NodeJS", "Alpine", "Yarn", "React"]
icon: https://www.eclipse.org/che/images/logo-eclipseche.svg
globalMemoryLimit: 2198Mi