Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update to 0.10.0-next
Contributed on behalf of STMicroelectronics
  • Loading branch information
sgraband committed Jan 25, 2024
commit 84a474af562be42c19e11d16ed7144a681f165ae
2 changes: 1 addition & 1 deletion .github/workflows/reusable-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
required: true

env:
VERSION: 0.9.1
VERSION: 0.10.0-next

jobs:
publish-next:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
required: true

env:
VERSION: 0.9.1
VERSION: 0.10.0-next

jobs:
build:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Changelog

## [0.10.0] - estimated 2024-04

## [0.9.0] - 2024-01-23

- [node/landing-page] Make npm workspace and remove yarn references from repo [#258](https://github.com/eclipsesource/theia-cloud/pull/258) | [#45](https://github.com/eclipsesource/theia-cloud-helm/pull/45) - contributed on behalf of STMicroelectronics
Expand Down
4 changes: 2 additions & 2 deletions demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM theiacloud/theia-cloud-demo:0.9.1 as production-stage
FROM theiacloud/theia-cloud-demo:0.10.0-next as production-stage

COPY --chown=theia:theia theiacloud-monitor-0.9.1.vsix /home/theia/plugins
COPY --chown=theia:theia theiacloud-monitor-0.10.0-next.vsix /home/theia/plugins
4 changes: 2 additions & 2 deletions dockerfiles/operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN mkdir /templates
WORKDIR /log-config
COPY java/operator/org.eclipse.theia.cloud.operator/log4j2.xml .
WORKDIR /operator
COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.9.1-jar-with-dependencies.jar .
COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.10.0-SNAPSHOT-jar-with-dependencies.jar .
# to get more debug information from the kubernetes client itself, add -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG below
ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.9.1-jar-with-dependencies.jar" ]
ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.10.0-SNAPSHOT-jar-with-dependencies.jar" ]
CMD [ "" ]
4 changes: 2 additions & 2 deletions dockerfiles/operator/Dockerfile.withcache
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN mkdir /templates
WORKDIR /log-config
COPY java/operator/org.eclipse.theia.cloud.operator/log4j2.xml .
WORKDIR /operator
COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.9.1-jar-with-dependencies.jar .
COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.10.0-SNAPSHOT-jar-with-dependencies.jar .
# to get more debug information from the kubernetes client itself, add -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG below
ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.9.1-jar-with-dependencies.jar" ]
ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.10.0-SNAPSHOT-jar-with-dependencies.jar" ]
CMD [ "" ]
4 changes: 2 additions & 2 deletions dockerfiles/service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN cd /service/common/maven-conf && \

FROM eclipse-temurin:17-jre-alpine
WORKDIR /service
COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.9.1-runner.jar .
COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.10.0-SNAPSHOT-runner.jar .
ENV APPID default-app-id
ENV SERVICE_PORT 8081

Expand All @@ -29,5 +29,5 @@ ENTRYPOINT java -Dtheia.cloud.app.id=${APPID} \
-Dquarkus.oidc.auth-server-url=${KEYCLOAK_SERVERURL} \
-Dquarkus.oidc.client-id=${KEYCLOAK_CLIENTID} \
-Dquarkus.oidc.credentials.secret=${KEYCLOAK_CLIENTSECRET} \
-jar ./service-0.9.1-runner.jar
-jar ./service-0.10.0-SNAPSHOT-runner.jar
CMD [ "" ]
4 changes: 2 additions & 2 deletions dockerfiles/service/Dockerfile.withcache
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN --mount=type=cache,target=/root/.m2 \

FROM eclipse-temurin:17-jre-alpine
WORKDIR /service
COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.9.1-runner.jar .
COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.10.0-SNAPSHOT-runner.jar .
ENV APPID default-app-id
ENV SERVICE_PORT 8081

Expand All @@ -30,5 +30,5 @@ ENTRYPOINT java -Dtheia.cloud.app.id=${APPID} \
-Dquarkus.oidc.auth-server-url=${KEYCLOAK_SERVERURL} \
-Dquarkus.oidc.client-id=${KEYCLOAK_CLIENTID} \
-Dquarkus.oidc.credentials.secret=${KEYCLOAK_CLIENTSECRET} \
-jar ./service-0.9.1-runner.jar
-jar ./service-0.10.0-SNAPSHOT-runner.jar
CMD [ "" ]
4 changes: 2 additions & 2 deletions helm/theia.cloud/valuesGKETryNow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ issuer:
email: jfaltermeier@eclipsesource.com

image:
name: theiacloud/theia-cloud-demo:0.9.1
name: theiacloud/theia-cloud-demo:0.10.0-next
pullSecret: ""
timeoutStrategy: "FIXEDTIME"
timeoutLimit: "30"
Expand All @@ -22,7 +22,7 @@ hosts:
instance: ws.theia-cloud.io

landingPage:
image: theiacloud/theia-cloud-try-now-page:0.9.1
image: theiacloud/theia-cloud-try-now-page:0.10.0-next
appDefinition: "theia-cloud-demo"
ephemeralStorage: true
additionalApps:
Expand Down
4 changes: 2 additions & 2 deletions helm/theia.cloud/valuesMonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ app:
name: Theia Blueprint

image:
name: theiacloud/theia-cloud-activity-demo:0.9.1
name: theiacloud/theia-cloud-activity-demo:0.10.0-next
pullSecret: ""
timeoutStrategy: "FIXEDTIME"
timeoutLimit: "0"
Expand All @@ -19,7 +19,7 @@ hosts:
instance: ws.theia-cloud.io

landingPage:
image: theiacloud/theia-cloud-try-now-page:0.9.1
image: theiacloud/theia-cloud-try-now-page:0.10.0-next
appDefinition: "theia-cloud-demo"
ephemeralStorage: true

Expand Down
2 changes: 1 addition & 1 deletion helm/theia.cloud/valuesTestTrynowPage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ hosts:
instance: ws.192.168.39.3.nip.io

landingPage:
image: theiacloud/theia-cloud-try-now-page:0.9.1
image: theiacloud/theia-cloud-try-now-page:0.10.0-next
imagePullPolicy: Always
appDefinition: "theia-cloud-demo"
ephemeralStorage: true
Expand Down
2 changes: 1 addition & 1 deletion java/common/maven-conf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.theia.cloud</groupId>
<artifactId>conf</artifactId>
<version>0.9.1</version>
<version>0.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Theia.Cloud Maven Configuration</name>
<description>Common properties and configuration</description>
Expand Down
2 changes: 1 addition & 1 deletion java/common/org.eclipse.theia.cloud.common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.eclipse.theia.cloud</groupId>
<artifactId>conf</artifactId>
<version>0.9.1</version>
<version>0.10.0-SNAPSHOT</version>
<relativePath>../../common/maven-conf/</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions java/operator/org.eclipse.theia.cloud.operator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.eclipse.theia.cloud</groupId>
<artifactId>conf</artifactId>
<version>0.9.1</version>
<version>0.10.0-SNAPSHOT</version>
<relativePath>../../common/maven-conf/</relativePath>
</parent>

Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>org.eclipse.theia.cloud</groupId>
<artifactId>common</artifactId>
<version>0.9.1</version>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
Expand Down
4 changes: 2 additions & 2 deletions java/service/org.eclipse.theia.cloud.service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.eclipse.theia.cloud</groupId>
<artifactId>conf</artifactId>
<version>0.9.1</version>
<version>0.10.0-SNAPSHOT</version>
<relativePath>../../common/maven-conf/</relativePath>
</parent>

Expand Down Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>org.eclipse.theia.cloud</groupId>
<artifactId>common</artifactId>
<version>0.9.1</version>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@

import jakarta.ws.rs.core.Application;

@OpenAPIDefinition(info = @Info(title = "Theia.cloud API", version = "0.9.1"))
@OpenAPIDefinition(info = @Info(title = "Theia.cloud API", version = "0.10.0"))
public class TheiaCloudApiApplication extends Application {
}
2 changes: 1 addition & 1 deletion node/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eclipse-theiacloud/common",
"version": "0.9.1",
"version": "0.10.0-next",
"description": "Common functionality for Theia.cloud",
"license": "EPL-2.0",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion node/landing-page/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@eclipse-theiacloud/common": "0.9.1",
"@eclipse-theiacloud/common": "0.10.0-next",
"@types/uuid": "^8.3.2",
"axios": "^0.25.0",
"core-js": "^3.6.5",
Expand Down
2 changes: 1 addition & 1 deletion node/monitor-theia/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eclipse-theiacloud/monitor-theia",
"version": "0.9.1",
"version": "0.10.0-next",
"keywords": [
"theia-extension"
],
Expand Down
2 changes: 1 addition & 1 deletion node/monitor/package.json
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this file should be formatted once to remove the tabs that were introduced, e.g. in front of the webpack script

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "theiacloud-monitor",
"displayName": "Theia.cloud Monitor extension",
"description": "Monitor for Theia.cloud hosted tools",
"version": "0.9.1",
"version": "0.10.0-next",
"license": "EPL-2.0",
"author": {
"name": "Theia.cloud"
Expand Down
18 changes: 9 additions & 9 deletions node/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node/testing-page/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@eclipse-theiacloud/common": "0.9.1",
"@eclipse-theiacloud/common": "0.10.0-next",
"keycloak-js": "^17.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion node/try-now-page/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"homepage": ".",
"dependencies": {
"@eclipse-theiacloud/common": "0.9.1",
"@eclipse-theiacloud/common": "0.10.0-next",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.2.0",
"@testing-library/user-event": "^13.5.0",
Expand Down
4 changes: 2 additions & 2 deletions terraform/modules/helm/theia-cloud.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ app:
name: Theia Cloud

image:
name: theiacloud/theia-cloud-demo:0.9.1
name: theiacloud/theia-cloud-demo:0.10.0-next
pullSecret: ""
timeoutStrategy: "FIXEDTIME"
timeoutLimit: "30"
Expand All @@ -19,7 +19,7 @@ hosts:
instance: instances

landingPage:
image: theiacloud/theia-cloud-landing-page:0.9.1
image: theiacloud/theia-cloud-landing-page:0.10.0-next
appDefinition: "theia-cloud-demo"
ephemeralStorage: false

Expand Down
2 changes: 1 addition & 1 deletion terraform/test-configurations/2-02_monitor/theia_cloud.tf
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ resource "helm_release" "theia-cloud" {

set {
name = "image.name"
value = var.use_vscode_extension ? "theiacloud/theia-cloud-activity-demo:0.9.1" : "theiacloud/theia-cloud-activity-demo-theia:0.9.1"
value = var.use_vscode_extension ? "theiacloud/theia-cloud-activity-demo:0.10.0-next" : "theiacloud/theia-cloud-activity-demo-theia:0.10.0-next"
}

set {
Expand Down