Skip to content

Commit

Permalink
Bump Debian Bookworm Linux version to bookworm-20240612 (#820)
Browse files Browse the repository at this point in the history
Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
github-actions[bot] committed Jun 17, 2024
1 parent 2631311 commit c046dd7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
ARG DEBIAN_RELEASE=bookworm-20240513
ARG DEBIAN_RELEASE=bookworm-20240612
FROM debian:"${DEBIAN_RELEASE}"-slim as jre-build

SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"]
Expand Down
2 changes: 1 addition & 1 deletion debian/preview/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG DEBIAN_RELEASE=bookworm-20240513
ARG DEBIAN_RELEASE=bookworm-20240612
FROM debian:"${DEBIAN_RELEASE}"-slim as jre-build
ARG JAVA_VERSION
ARG TARGETPLATFORM
Expand Down
12 changes: 6 additions & 6 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ variable "ALPINE_SHORT_TAG" {
}

variable "DEBIAN_RELEASE" {
default = "bookworm-20240513"
default = "bookworm-20240612"
}

variable "JAVA11_VERSION" {
Expand Down Expand Up @@ -138,15 +138,15 @@ function "javaversion" {
? "${JAVA11_VERSION}"
: (equal(17, jdk)
? "${JAVA17_VERSION}"
: "${JAVA21_VERSION}"))
: "${JAVA21_VERSION}"))
}

# Return an array of Alpine platforms to use depending on the jdk passed as parameter
function "alpine_platforms" {
params = [jdk]
result = (equal(21, jdk)
? ["linux/amd64", "linux/arm64"]
: ["linux/amd64"])
: ["linux/amd64"])
}

# Return an array of Debian platforms to use depending on the jdk passed as parameter
Expand All @@ -156,13 +156,13 @@ function "debian_platforms" {
? ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/arm/v7", "linux/s390x"]
: (equal(17, jdk)
? ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/arm/v7"]
: ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]))
: ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]))
}

target "alpine" {
matrix = {
type = ["agent", "inbound-agent"]
jdk = [11, 17, 21]
jdk = [11, 17, 21]
}
name = "${type}_alpine_jdk${jdk}"
target = type
Expand Down Expand Up @@ -196,7 +196,7 @@ target "alpine" {
target "debian" {
matrix = {
type = ["agent", "inbound-agent"]
jdk = [11, 17, 21]
jdk = [11, 17, 21]
}
name = "${type}_debian_${jdk}"
target = type
Expand Down

0 comments on commit c046dd7

Please sign in to comment.