Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
15 changes: 15 additions & 0 deletions .github/workflows/build_config_server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ concurrency:

permissions:
contents: read
pull-requests: 'write'

env:
IMAGE_NAME: config-server
Expand Down Expand Up @@ -47,3 +48,17 @@ jobs:

- name: Push image
run: docker push --all-tags ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- uses: actions/github-script@v7
if: ${{ github.event_name == 'pull_request' }}
with:
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: `To run the Spring Cloud Config Server image built for this pull request:
\`\`\`bash
docker run --rm -d --pull=always -p 8888:8888 --name config-pr steeltoe.azurecr.io/config-server:pr-${{ github.event.number }}
\`\`\``
})
15 changes: 15 additions & 0 deletions .github/workflows/build_eureka_server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ concurrency:

permissions:
contents: read
pull-requests: 'write'

env:
IMAGE_NAME: eureka-server
Expand Down Expand Up @@ -47,3 +48,17 @@ jobs:

- name: Push image
run: docker push --all-tags ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- uses: actions/github-script@v7
if: ${{ github.event_name == 'pull_request' }}
with:
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: `To run the Eureka server image built for this pull request:
\`\`\`bash
docker run --rm -d --pull=always -p 8761:8761 --name eureka-pr steeltoe.azurecr.io/eureka-server:pr-${{ github.event.number }}
\`\`\``
})
15 changes: 15 additions & 0 deletions .github/workflows/build_springboot_admin_server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ concurrency:

permissions:
contents: read
pull-requests: 'write'

env:
IMAGE_NAME: spring-boot-admin
Expand Down Expand Up @@ -47,3 +48,17 @@ jobs:

- name: Push image
run: docker push --all-tags ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- uses: actions/github-script@v7
if: ${{ github.event_name == 'pull_request' }}
with:
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: `To run the Spring Boot Admin server image built for this pull request:
\`\`\`bash
docker run --rm -d --pull=always -p 9099:9099 --name sba-pr steeltoe.azurecr.io/spring-boot-admin:pr-${{ github.event.number }}
\`\`\``
})
15 changes: 15 additions & 0 deletions .github/workflows/build_uaa_server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ concurrency:

permissions:
contents: read
pull-requests: 'write'

env:
IMAGE_NAME: uaa-server
Expand Down Expand Up @@ -47,3 +48,17 @@ jobs:

- name: Push image
run: docker push --all-tags ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- uses: actions/github-script@v7
if: ${{ github.event_name == 'pull_request' }}
with:
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: `To run the UAA server image built for this pull request:
\`\`\`bash
docker run --rm -d --pull=always -p 8080:8080 --name uaa-pr steeltoe.azurecr.io/uaa-server:pr-${{ github.event.number }}
\`\`\``
})
4 changes: 2 additions & 2 deletions spring-boot-admin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ WORKDIR /scratch
RUN apk update && apk add ca-certificates && apk add curl && apk add patch
RUN curl https://start.spring.io/starter.zip \
-d type=gradle-project \
-d bootVersion=3.4.1 \
-d bootVersion=3.4.3 \
-d javaVersion=$JVM \
-d groupId=io.steeltoe.docker \
-d artifactId=springbootadmin \
-d applicationName=SpringBootAdmin \
-d language=java \
-d dependencies=codecentric-spring-boot-admin-server \
-d version=3.4.1 \
-d version=3.4.3 \
--output springbootadmin.zip
RUN mkdir springbootadmin && unzip -d springbootadmin springbootadmin.zip
COPY metadata metadata
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin/metadata/IMAGE_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.1
3.4.3
6 changes: 3 additions & 3 deletions uaa-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# UAA Server Build
# -----------------------------------------------------------------------------

FROM cloudfoundry/uaa:77.10.0
FROM cloudfoundry/uaa:77.20.0
COPY uaa.yml /uaa/uaa.yml
COPY log4j2.properties /uaa/log4j2.properties
ENV CLOUDFOUNDRY_CONFIG_PATH /uaa
ENV SPRING_PROFILES hsql,default
ENV CLOUDFOUNDRY_CONFIG_PATH=/uaa
ENV SPRING_PROFILES=hsql,default
EXPOSE 8080
10 changes: 8 additions & 2 deletions uaa-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ This directory contains resources for building a [CloudFoundry User Account and
To run this image locally:

```shell
docker run -it -p 8080:8080 --name steeltoe-uaa steeltoe.azurecr.io/uaa-server:77.10
docker run -it -p 8080:8080 --name steeltoe-uaa steeltoe.azurecr.io/uaa-server:77
```

To run this image locally, overwriting the included `uaa.yml` file:

```shell
docker run -it -p 8080:8080 --name steeltoe-uaa -v $pwd/uaa.yml:/uaa/uaa.yml steeltoe.azurecr.io/uaa-server:77
```

## Customizing for your Cloud Foundry environment
Expand All @@ -21,6 +27,6 @@ These instructions will help you build and deploy a custom image to use as an id
1. `.\build.ps1 uaa-server`.
1. Push the image to an image repository accessible from your Cloud Foundry environment.
1. Deploy the image with a command similar to this:
* `cf push steeltoe-uaa --docker-image steeltoe.azurecr.io/uaa-server:77.10`
* `cf push steeltoe-uaa --docker-image steeltoe.azurecr.io/uaa-server:77`
1. (Operator task) [Add the new identity provider with OpenID Connect](https://docs.vmware.com/en/Single-Sign-On-for-VMware-Tanzu-Application-Service/1.14/sso/GUID-configure-external-id.html#config-ext-oidc)
* Use the `ssotile` credentials from uaa.yml
2 changes: 1 addition & 1 deletion uaa-server/metadata/ADDITIONAL_TAGS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-t uaa-server:77.10 -t uaa-server:77
-t uaa-server:77.20 -t uaa-server:77
2 changes: 1 addition & 1 deletion uaa-server/metadata/IMAGE_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
77.10.0
77.20.0