Skip to content
This repository has been archived by the owner on Jul 28, 2023. It is now read-only.

Commit

Permalink
Merge pull request #316 from groeges/release-0.6
Browse files Browse the repository at this point in the history
Backport latest fixes from master
  • Loading branch information
kilnerm authored Apr 3, 2020
2 parents 5f7634c + b8d3abc commit 27a3254
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
8 changes: 4 additions & 4 deletions ci/tekton/stacks-build-task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ spec:
else
sed -i -e 's/host:/host: $(inputs.params.routeHostname)/' $YAML_FILE
fi
sed -i -e 's/REGISTRY/$(inputs.params.registry)/' $YAML_FILE
sed -i -e 's/NAMESPACE/$(inputs.params.registryNamespace)/' $YAML_FILE
sed -i -e 's/TAG/latest/' $YAML_FILE
sed -i -e "s/DATE/$(date --utc '+%FT%TZ')/" $YAML_FILE
sed -i -e 's|REGISTRY|$(inputs.params.registry)|' $YAML_FILE
sed -i -e 's|NAMESPACE|$(inputs.params.registryNamespace)|' $YAML_FILE
sed -i -e 's|TAG|latest|' $YAML_FILE
sed -i -e "s|DATE|$(date --utc '+%FT%TZ')|" $YAML_FILE
kubectl apply --validate=false -f $YAML_FILE
volumes:
Expand Down
6 changes: 5 additions & 1 deletion incubator/java-spring-boot2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@ The stack implementation provides for two Docker image specifications, as stack
The `finalimage` specification determines the image that will be used as the base for the application image. The `baseimage` is used as the base for the stack runtime (a development tool), and also for the "prep" stage of the application image build. By default, as shown above, a Debian image is used for `baseimage` and a Red Hat UBI image is used for `finalimage`.
The stack implementation provides for optionally updating the packages in these images during the Docker build. By default, the UBI base for the `finalimage` is not updated, while the stack image on the other hand does get updated during a build of the stack itself.
The stack implementation provides for optionally updating the packages in these images during the Docker build. By default, packages are not updated in either image. To "turn on" package update, modify the Dockerfile (or Dockerfile-stack) and add the `--system` option to the invocation of `update.sh`.
```
RUN /update.sh --system
```
For more information about UBI see:
[Introducing the Red Hat Universal Base Image](https://www.redhat.com/en/blog/introducing-red-hat-universal-base-image)
Expand Down
2 changes: 1 addition & 1 deletion incubator/java-spring-boot2/image/Dockerfile-stack
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LABEL vendor="Kabanero" \

# Ensure up to date / patched OS
COPY ./project/update.sh /update.sh
RUN /update.sh --system
RUN /update.sh

RUN groupadd --gid 1000 java_group \
&& useradd --uid 1000 --gid java_group --shell /bin/bash --create-home java_user \
Expand Down
2 changes: 1 addition & 1 deletion incubator/java-spring-boot2/stack.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Spring Boot®
version: 0.3.24
version: 0.3.28
description: Spring Boot using OpenJ9 and Maven
license: Apache-2.0
language: java
Expand Down

0 comments on commit 27a3254

Please sign in to comment.