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

deps(jkube-tomcat): bump tomcat from 10.1.24 to 10.1.34 #63

Merged
merged 2 commits into from
Jan 9, 2025
Merged

deps(jkube-tomcat): bump tomcat from 10.1.24 to 10.1.34 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dba131f
deps(jkube-tomcat): bump tomcat from 10.1.24 to 10.1.34
manusa Jan 9, 2025
7914e7f
feat(ci): allow for --no-squash argument
manusa Jan 9, 2025
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
28 changes: 21 additions & 7 deletions .github/workflows/build-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,33 @@ jobs:
strategy:
fail-fast: false
matrix:
image: [
'jkube-java', 'jkube-java-17', 'jkube-java-11', 'jkube-jetty9', 'jkube-karaf', 'jkube-remote-dev', 'jkube-tomcat9', 'jkube-tomcat'
]
image:
- name: 'jkube-java'
args: ''
- name: 'jkube-java-17'
args: ''
- name: 'jkube-java-11'
args: ''
- name: 'jkube-jetty9'
args: ''
- name: 'jkube-karaf'
args: ''
- name: 'jkube-remote-dev'
args: ''
- name: 'jkube-tomcat9'
args: ''
- name: 'jkube-tomcat'
args: --no-squash
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install CEKit
uses: cekit/[email protected]
- name: Build ${{ matrix.image }}
- name: Build ${{ matrix.image.name }}
run: |
echo "Building quay.io/jkube/${{ matrix.image }}:${TAG}"
cekit --descriptor ${{ matrix.image }}.yaml build docker --tag="quay.io/jkube/${{ matrix.image }}:${TAG}"
echo "Building quay.io/jkube/${{ matrix.image.name }}:${TAG}"
cekit --descriptor ${{ matrix.image.name }}.yaml build docker ${{ matrix.image.args }} --tag="quay.io/jkube/${{ matrix.image.name }}:${TAG}"
- name: Test
if: success()
run: |
./scripts/test-${{ matrix.image }}.sh
./scripts/test-${{ matrix.image.name }}.sh
28 changes: 21 additions & 7 deletions .github/workflows/push-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,23 @@ jobs:
strategy:
fail-fast: false
matrix:
image: [
'jkube-java', 'jkube-java-17', 'jkube-java-11', 'jkube-jetty9', 'jkube-karaf', 'jkube-remote-dev', 'jkube-tomcat9', 'jkube-tomcat'
]
image:
- name: 'jkube-java'
args: ''
- name: 'jkube-java-17'
args: ''
- name: 'jkube-java-11'
args: ''
- name: 'jkube-jetty9'
args: ''
- name: 'jkube-karaf'
args: ''
- name: 'jkube-remote-dev'
args: ''
- name: 'jkube-tomcat9'
args: ''
- name: 'jkube-tomcat'
args: --no-squash
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -24,12 +38,12 @@ jobs:
id: get_version
run: |
export GITHUB_TAG=${GITHUB_REF/refs\/tags\//}
echo "TAG=quay.io/jkube/${{ matrix.image }}:${GITHUB_TAG/v/}" >> $GITHUB_ENV
- name: Build ${{ matrix.image }}
echo "TAG=quay.io/jkube/${{ matrix.image.name }}:${GITHUB_TAG/v/}" >> $GITHUB_ENV
- name: Build ${{ matrix.image.name }}
run: |
echo "Building ${TAG}"
cekit --descriptor ${{ matrix.image }}.yaml build docker --tag="${TAG}"
- name: Push quay.io/jkube/${{ matrix.image }}
cekit --descriptor ${{ matrix.image.name }}.yaml build docker ${{ matrix.image.args }} --tag="${TAG}"
- name: Push quay.io/jkube/${{ matrix.image.name }}
run: |
echo "Pushing ${TAG}"
docker login -u=${{ secrets.QUAY_USER }} -p=${{ secrets.QUAY_TOKEN }} quay.io
Expand Down
2 changes: 1 addition & 1 deletion jkube-tomcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ schema_version: 1
name: "quay.io/jkube/jkube-tomcat"
description: "Base image for Apache Tomcat webapp deployments"
version: "latest"
from: "tomcat:10.1.24-jdk21-temurin"
from: "tomcat:10.1.34-jdk21-temurin"

labels:
- name: "io.k8s.display-name"
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-jkube-tomcat.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source "$BASEDIR/common.sh"

IMAGE="quay.io/jkube/jkube-tomcat:$TAG_OR_LATEST"

assertContains "$(dockerRun 'id')" "uid=1000 gid=0(root) groups=0(root)" || reportError "Invalid run user, should be 1000"
assertContains "$(dockerRun 'id')" "uid=1000(ubuntu) gid=1000(ubuntu) groups=1000(ubuntu)" || reportError "Invalid run user, should be 1000"

java_version="$(dockerRun 'java -version')"
assertMatches "$java_version" 'openjdk version "21.[0-9]+.[0-9]+".*' || reportError "Invalid Java version:\n\n$java_version"
Expand Down
Loading