Skip to content

Commit

Permalink
Fixing multiworkshop
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgemoralespou committed Jul 12, 2024
1 parent 4bf69c1 commit e51d754
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 54 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/publish-workshop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Carvel tools
shell: bash
Expand All @@ -27,9 +27,7 @@ jobs:
- name: Install Educates CLI
shell: bash
run: |
# curl -Lo /usr/local/bin/educates https://github.com/vmware-tanzu-labs/educates-training-platform/releases/download/2.6.0/educates-linux-amd64
# chmod +x /usr/local/bin/educates
imgpkg pull -i ghcr.io/vmware-tanzu-labs/educates-client-programs:2.6.0 -o /tmp/client-programs
imgpkg pull -i ghcr.io/vmware-tanzu-labs/educates-client-programs:2.7.2 -o /tmp/client-programs
mv /tmp/client-programs/educates-linux-amd64 /usr/local/bin/educates
- name: Setup repository variables and release details
Expand Down
15 changes: 0 additions & 15 deletions workshops/lab-containerizing-spring/resources/trainingportal.yaml

This file was deleted.

8 changes: 6 additions & 2 deletions workshops/lab-containerizing-spring/resources/workshop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ metadata:
spec:
title: Containerizing a Spring Boot application
description: A workshop describing how to run a Spring Boot application in docker.
publish:
image: $(image_repository)/lab-containerizing-spring-files:$(workshop_version)
workshop:
image: jdk17-environment:*
files:
- image:
url: $(image_repository)/labs-spring-workshops-files:$(workshop_version)
url: $(image_repository)/lab-containerizing-spring-files:$(workshop_version)
includePaths:
- /workshops/lab-containerizing-spring/workshop/**
- /workshop/**
- /exercises/**
- /README.md
newRootPath: workshops/lab-containerizing-spring
session:
resources:
Expand Down
15 changes: 0 additions & 15 deletions workshops/lab-creating-a-spring-app/resources/trainingportal.yaml

This file was deleted.

9 changes: 6 additions & 3 deletions workshops/lab-creating-a-spring-app/resources/workshop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,17 @@ metadata:
spec:
title: Creating a Spring Boot application
description: A workshop introducing the start.spring.io web site.
publish:
image: $(image_repository)/labs-creating-a-spring-app-files:$(workshop_version)
workshop:
image: jdk17-environment:*
files:
- image:
url: $(image_repository)/labs-spring-workshops-files:$(workshop_version)
url: $(image_repository)/labs-creating-a-spring-app-files:$(workshop_version)
includePaths:
- /workshops/lab-creating-a-spring-app/workshop/**
newRootPath: workshops/lab-creating-a-spring-app
- /workshop/**
- /exercises/**
- /README.md
- path: .m2
image:
url: ghcr.io/educates/lab-spring-boot-on-k8s-maven:latest
Expand Down
15 changes: 0 additions & 15 deletions workshops/lab-spring-boot-on-k8s/resources/trainingportal.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions workshops/lab-spring-boot-on-k8s/resources/workshop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ metadata:
spec:
title: Spring Boot on Kubernetes
description: Introduction to Spring Boot on Kubernetes
publish:
image: $(image_repository)/lab-spring-boot-on-k8s-files:$(workshop_version)
workshop:
image: jdk17-environment:*
files:
Expand Down

0 comments on commit e51d754

Please sign in to comment.