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.

Sign up for GitHub

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

Prepare 0.11.0-next #292

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Prepare 0.11.0-next #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/publish-demos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
required: true

env:
VERSION: 0.10.0
VERSION: 0.11.0-next

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

env:
VERSION: 0.10.0
VERSION: 0.11.0-next

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM theiacloud/theia-cloud-demo:0.10.0 as production-stage
FROM theiacloud/theia-cloud-demo:0.11.0-next as production-stage

COPY --chown=theia:theia theiacloud-monitor-0.10.0.vsix /home/theia/plugins
COPY --chown=theia:theia theiacloud-monitor-0.11.0-next.vsix /home/theia/plugins
Binary file renamed ...tor-vscode/theiacloud-monitor-0.10.0.vsix → ...scode/theiacloud-monitor-0.11.0-next.vsix
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions dockerfiles/conversion-webhook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN cd /conversion/common/maven-conf && \

FROM eclipse-temurin:17-jre-alpine
WORKDIR /conversion
COPY --from=builder /conversion/conversion/org.eclipse.theia.cloud.conversion/target/conversion-webhook-0.10.0-runner.jar .
COPY --from=builder /conversion/conversion/org.eclipse.theia.cloud.conversion/target/conversion-webhook-0.11.0-SNAPSHOT-runner.jar .

ENTRYPOINT java -jar ./conversion-webhook-0.10.0-runner.jar
ENTRYPOINT java -jar ./conversion-webhook-0.11.0-SNAPSHOT-runner.jar
CMD [ "" ]
4 changes: 2 additions & 2 deletions dockerfiles/operator/Dockerfile
View file
Open in desktop
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.10.0-jar-with-dependencies.jar .
COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.11.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.10.0-jar-with-dependencies.jar" ]
ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.11.0-SNAPSHOT-jar-with-dependencies.jar" ]
CMD [ "" ]
4 changes: 2 additions & 2 deletions dockerfiles/operator/Dockerfile.withcache
View file
Open in desktop
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.10.0-jar-with-dependencies.jar .
COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.11.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.10.0-jar-with-dependencies.jar" ]
ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.11.0-SNAPSHOT-jar-with-dependencies.jar" ]
CMD [ "" ]
4 changes: 2 additions & 2 deletions dockerfiles/service/Dockerfile
View file
Open in desktop
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.10.0-runner.jar .
COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.11.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.10.0-runner.jar
-jar ./service-0.11.0-SNAPSHOT-runner.jar
CMD [ "" ]
4 changes: 2 additions & 2 deletions dockerfiles/service/Dockerfile.withcache
View file
Open in desktop
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.10.0-runner.jar .
COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.11.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.10.0-runner.jar
-jar ./service-0.11.0-SNAPSHOT-runner.jar
CMD [ "" ]
2 changes: 1 addition & 1 deletion java/common/maven-conf/pom.xml
View file
Open in desktop
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.10.0</version>
<version>0.11.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
View file
Open in desktop
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.10.0</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../../common/maven-conf/</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions java/conversion/org.eclipse.theia.cloud.conversion/pom.xml
View file
Open in desktop
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.10.0</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../../common/maven-conf/</relativePath>
</parent>

Expand Down Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>org.eclipse.theia.cloud</groupId>
<artifactId>common</artifactId>
<version>0.10.0</version>
<version>0.11.0-SNAPSHOT</version>
</dependency>
<!-- Webhooks -->
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions java/operator/org.eclipse.theia.cloud.operator/pom.xml
View file
Open in desktop
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.10.0</version>
<version>0.11.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.10.0</version>
<version>0.11.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
View file
Open in desktop
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.10.0</version>
<version>0.11.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.10.0</version>
<version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
Expand Down
2 changes: 1 addition & 1 deletion node/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eclipse-theiacloud/common",
"version": "0.10.0",
"version": "0.11.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
View file
Open in desktop
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.10.0",
"@eclipse-theiacloud/common": "0.11.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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eclipse-theiacloud/monitor-theia",
"version": "0.10.0",
"version": "0.11.0-next",
"keywords": [
"theia-extension"
],
Expand Down
4 changes: 2 additions & 2 deletions node/monitor/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion node/monitor/package.json
View file
Open in desktop
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.10.0",
"version": "0.11.0-next",
"license": "EPL-2.0",
"author": {
"name": "Theia.cloud"
Expand Down
18 changes: 9 additions & 9 deletions node/package-lock.json
View file
Open in desktop

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
View file
Open in desktop
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.10.0",
"@eclipse-theiacloud/common": "0.11.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"homepage": ".",
"dependencies": {
"@eclipse-theiacloud/common": "0.10.0",
"@eclipse-theiacloud/common": "0.11.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ app:
name: Theia Cloud

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

landingPage:
image: theiacloud/theia-cloud-landing-page:0.10.0
image: theiacloud/theia-cloud-landing-page:0.11.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ resource "helm_release" "theia-cloud" {

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

set {
Expand Down
4 changes: 2 additions & 2 deletions terraform/values/valuesDemo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ issuer:
email: [email protected]

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

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

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

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

Expand Down
Loading