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.

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

QD-8148 Bump debian to bookworm #225

Merged
merged 2 commits into from
Feb 21, 2025
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
9 changes: 2 additions & 7 deletions .github/workflows/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,8 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ["next", "2024.2", "2024.3", "2025.1"]
group: ["default", "more", "clang"]
include:
- version: "next"
group: "ruby"
- version: "2024.3"
group: "ruby"
version: ["next", "2025.1"]
group: ["default", "more", "clang", "ruby"]
runs-on: ubuntu-latest
steps:
- name: Clean up
Expand Down
58 changes: 29 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,35 @@ on:
- cron: '0 0 * * 1'

jobs:
# build243:
# name: "2024.3"
# strategy:
# matrix:
# platform: [ linux/amd64 ] # linux/arm64
# linter: [ android-community, android, dotnet, go, js, jvm, jvm-community, php, python, python-community, dotnet-community, cpp, cnova ]
# runs-on: ubuntu-latest
# steps:
# - name: Checkout
# uses: actions/checkout@v4
# - uses: dorny/paths-filter@v3
# id: changes
# with:
# filters: |
# dockerfile:
# - '2024.3/${{ matrix.linter }}/Dockerfile'
# - if: steps.changes.outputs.dockerfile == 'true'
# name: Set up Docker Buildx
# uses: docker/setup-buildx-action@v3
# - if: steps.changes.outputs.dockerfile == 'true'
# name: Build
# uses: docker/build-push-action@v6
# with:
# tags: jetbrains/qodana-${{ matrix.linter }}:2024.3
# context: 2024.3/${{ matrix.linter }}
# platforms: ${{ matrix.platform }}
# push: false
# cache-from: type=gha
# cache-to: type=gha,mode=max,ignore-error=true
build243:
name: "2024.3"
strategy:
matrix:
platform: [ linux/amd64 ] # linux/arm64
linter: [ android-community, android, dotnet, go, js, jvm, jvm-community, php, python, python-community, dotnet-community, cpp, cnova ]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: dorny/paths-filter@v3
id: changes
with:
filters: |
dockerfile:
- '2024.3/${{ matrix.linter }}/Dockerfile'
- if: steps.changes.outputs.dockerfile == 'true'
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- if: steps.changes.outputs.dockerfile == 'true'
name: Build
uses: docker/build-push-action@v6
with:
tags: jetbrains/qodana-${{ matrix.linter }}:2024.3
context: 2024.3/${{ matrix.linter }}
platforms: ${{ matrix.platform }}
push: false
cache-from: type=gha
cache-to: type=gha,mode=max,ignore-error=true

build242:
name: "2024.2"
Expand Down
2 changes: 1 addition & 1 deletion 2024.3/base/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ group "clang" {
}

group "ruby" {
targets = ["ruby2x", "ruby3x"]
targets = []
}

target "debian" {
Expand Down
76 changes: 38 additions & 38 deletions 2025.1/base/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ With `--print` option in the previous command you'll get the full picture of ima
},
"dockerfile": "debian.js.Dockerfile",
"args": {
"NODE_TAG": "20-bullseye-slim"
"NODE_TAG": "20-bookworm-slim"
},
"tags": [
"registry.jetbrains.team/p/sa/containers/qodana:debian-js-base"
Expand All @@ -67,12 +67,12 @@ With `--print` option in the previous command you'll get the full picture of ima
"dockerfile": "dotnet.Dockerfile",
"args": {
"COMPOSER_TAG": "2.5.1",
"DOTNET_TAG": "6.0-bullseye-slim",
"GO_TAG": "1.19-bullseye",
"NODE_TAG": "20-bullseye-slim",
"PHP_TAG": "8.1-cli-bullseye",
"RUBY_TAG": "3.0-bullseye",
"RUST_TAG": "1.71-slim-bullseye"
"DOTNET_TAG": "6.0-bookworm-slim",
"GO_TAG": "1.19-bookworm",
"NODE_TAG": "20-bookworm-slim",
"PHP_TAG": "8.1-cli-bookworm",
"RUBY_TAG": "3.0-bookworm",
"RUST_TAG": "1.71-slim-bookworm"
},
"tags": [
"registry.jetbrains.team/p/sa/containers/qodana:dotnet-base"
Expand All @@ -87,12 +87,12 @@ With `--print` option in the previous command you'll get the full picture of ima
"dockerfile": "go.Dockerfile",
"args": {
"COMPOSER_TAG": "2.5.1",
"DOTNET_TAG": "6.0-bullseye-slim",
"GO_TAG": "1.19-bullseye",
"NODE_TAG": "20-bullseye-slim",
"PHP_TAG": "8.1-cli-bullseye",
"RUBY_TAG": "3.0-bullseye",
"RUST_TAG": "1.71-slim-bullseye"
"DOTNET_TAG": "6.0-bookworm-slim",
"GO_TAG": "1.19-bookworm",
"NODE_TAG": "20-bookworm-slim",
"PHP_TAG": "8.1-cli-bookworm",
"RUBY_TAG": "3.0-bookworm",
"RUST_TAG": "1.71-slim-bookworm"
},
"tags": [
"registry.jetbrains.team/p/sa/containers/qodana:go-base"
Expand All @@ -107,12 +107,12 @@ With `--print` option in the previous command you'll get the full picture of ima
"dockerfile": "js.Dockerfile",
"args": {
"COMPOSER_TAG": "2.5.1",
"DOTNET_TAG": "6.0-bullseye-slim",
"GO_TAG": "1.19-bullseye",
"NODE_TAG": "20-bullseye-slim",
"PHP_TAG": "8.1-cli-bullseye",
"RUBY_TAG": "3.0-bullseye",
"RUST_TAG": "1.71-slim-bullseye"
"DOTNET_TAG": "6.0-bookworm-slim",
"GO_TAG": "1.19-bookworm",
"NODE_TAG": "20-bookworm-slim",
"PHP_TAG": "8.1-cli-bookworm",
"RUBY_TAG": "3.0-bookworm",
"RUST_TAG": "1.71-slim-bookworm"
},
"tags": [
"registry.jetbrains.team/p/sa/containers/qodana:js-base"
Expand All @@ -127,12 +127,12 @@ With `--print` option in the previous command you'll get the full picture of ima
"dockerfile": "php.Dockerfile",
"args": {
"COMPOSER_TAG": "2.5.1",
"DOTNET_TAG": "6.0-bullseye-slim",
"GO_TAG": "1.19-bullseye",
"NODE_TAG": "20-bullseye-slim",
"PHP_TAG": "8.1-cli-bullseye",
"RUBY_TAG": "3.0-bullseye",
"RUST_TAG": "1.71-slim-bullseye"
"DOTNET_TAG": "6.0-bookworm-slim",
"GO_TAG": "1.19-bookworm",
"NODE_TAG": "20-bookworm-slim",
"PHP_TAG": "8.1-cli-bookworm",
"RUBY_TAG": "3.0-bookworm",
"RUST_TAG": "1.71-slim-bookworm"
},
"tags": [
"registry.jetbrains.team/p/sa/containers/qodana:php-base"
Expand Down Expand Up @@ -163,7 +163,7 @@ With `--print` option in the previous command you'll get the full picture of ima
},
"dockerfile": "python.js.Dockerfile",
"args": {
"NODE_TAG": "20-bullseye-slim"
"NODE_TAG": "20-bookworm-slim"
},
"tags": [
"registry.jetbrains.team/p/sa/containers/qodana:python-js-base"
Expand All @@ -178,12 +178,12 @@ With `--print` option in the previous command you'll get the full picture of ima
"dockerfile": "ruby.Dockerfile",
"args": {
"COMPOSER_TAG": "2.5.1",
"DOTNET_TAG": "6.0-bullseye-slim",
"GO_TAG": "1.19-bullseye",
"NODE_TAG": "20-bullseye-slim",
"PHP_TAG": "8.1-cli-bullseye",
"RUBY_TAG": "3.0-bullseye",
"RUST_TAG": "1.71-slim-bullseye"
"DOTNET_TAG": "6.0-bookworm-slim",
"GO_TAG": "1.19-bookworm",
"NODE_TAG": "20-bookworm-slim",
"PHP_TAG": "8.1-cli-bookworm",
"RUBY_TAG": "3.0-bookworm",
"RUST_TAG": "1.71-slim-bookworm"
},
"tags": [
"registry.jetbrains.team/p/sa/containers/qodana:ruby-base"
Expand All @@ -198,12 +198,12 @@ With `--print` option in the previous command you'll get the full picture of ima
"dockerfile": "rust.Dockerfile",
"args": {
"COMPOSER_TAG": "2.5.1",
"DOTNET_TAG": "6.0-bullseye-slim",
"GO_TAG": "1.19-bullseye",
"NODE_TAG": "20-bullseye-slim",
"PHP_TAG": "8.1-cli-bullseye",
"RUBY_TAG": "3.0-bullseye",
"RUST_TAG": "1.71-slim-bullseye"
"DOTNET_TAG": "6.0-bookworm-slim",
"GO_TAG": "1.19-bookworm",
"NODE_TAG": "20-bookworm-slim",
"PHP_TAG": "8.1-cli-bookworm",
"RUBY_TAG": "3.0-bookworm",
"RUST_TAG": "1.71-slim-bookworm"
},
"tags": [
"registry.jetbrains.team/p/sa/containers/qodana:rust-base"
Expand Down
2 changes: 1 addition & 1 deletion 2025.1/base/cdnet.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG DOTNET_BASE_TAG="7.0-bullseye-slim"
ARG DOTNET_BASE_TAG="7.0-bookworm-slim"
FROM mcr.microsoft.com/dotnet/sdk:$DOTNET_BASE_TAG

ENV HOME="/root" \
Expand Down
4 changes: 2 additions & 2 deletions 2025.1/base/debian.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE_TAG="bullseye-slim"
ARG NODE_TAG="22-bullseye-slim"
ARG BASE_TAG="bookworm-slim"
ARG NODE_TAG="22-bookworm-slim"
FROM node:$NODE_TAG AS node_base
FROM debian:$BASE_TAG

Expand Down
2 changes: 1 addition & 1 deletion 2025.1/base/debian.js.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NODE_TAG="22-bullseye-slim"
ARG NODE_TAG="22-bookworm-slim"
FROM node:$NODE_TAG AS node_base
FROM debianbase

Expand Down
21 changes: 3 additions & 18 deletions 2025.1/base/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ group "clang" {
}

group "ruby" {
targets = ["ruby2x", "ruby3x"]
targets = ["ruby3x"]
}

target "debian" {
Expand Down Expand Up @@ -86,24 +86,9 @@ target "cpp" {
}
}

target "ruby2x" {
matrix = {
version = ["6", "7"]
}
name = "ruby-base-2${version}-251"
tags = [
"registry.jetbrains.team/p/sa/containers/qodana:ruby-base-2.${version}-251"
]
platforms = ["linux/amd64", "linux/arm64"]
dockerfile = "ruby.Dockerfile"
args = {
RUBY_TAG = "2.${version}-slim-bullseye"
}
}

target "ruby3x" {
matrix = {
version = ["0", "1", "2", "3"]
version = ["1", "2", "3"]
}
name = "ruby-base-3${version}-251"
tags = [
Expand All @@ -112,6 +97,6 @@ target "ruby3x" {
platforms = ["linux/amd64", "linux/arm64"]
dockerfile = "ruby.Dockerfile"
args = {
RUBY_TAG = "3.${version}-slim-bullseye"
RUBY_TAG = "3.${version}-slim-bookworm"
}
}
4 changes: 2 additions & 2 deletions 2025.1/base/dotnet.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG NODE_TAG="22-bullseye-slim"
ARG DOTNET_BASE_TAG="7.0-bullseye-slim"
ARG NODE_TAG="22-bookworm-slim"
ARG DOTNET_BASE_TAG="7.0-bookworm-slim"
FROM node:$NODE_TAG AS node_base
FROM mcr.microsoft.com/dotnet/sdk:$DOTNET_BASE_TAG

Expand Down
4 changes: 2 additions & 2 deletions 2025.1/base/go.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG GO_TAG="1.24-bullseye"
ARG NODE_TAG="22-bullseye-slim"
ARG GO_TAG="1.24-bookworm"
ARG NODE_TAG="22-bookworm-slim"
FROM node:$NODE_TAG AS node_base
FROM golang:$GO_TAG

Expand Down
2 changes: 1 addition & 1 deletion 2025.1/base/js.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NODE_TAG="22-bullseye-slim"
ARG NODE_TAG="22-bookworm-slim"
FROM node:$NODE_TAG

# renovate: datasource=npm depName=eslint
Expand Down
4 changes: 2 additions & 2 deletions 2025.1/base/php.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG NODE_TAG="22-bullseye-slim"
ARG PHP_TAG="8.4-cli-bullseye"
ARG NODE_TAG="22-bookworm-slim"
ARG PHP_TAG="8.4-cli-bookworm"
ARG COMPOSER_TAG="2.8.5"
FROM node:$NODE_TAG AS node_base
FROM composer:$COMPOSER_TAG AS composer_base
Expand Down
2 changes: 1 addition & 1 deletion 2025.1/base/python.js.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NODE_TAG="22-bullseye-slim"
ARG NODE_TAG="22-bookworm-slim"
FROM node:$NODE_TAG AS node_base
FROM pythonbase

Expand Down
4 changes: 2 additions & 2 deletions 2025.1/base/ruby.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG NODE_TAG="22-bullseye-slim"
ARG RUBY_TAG="3.4-slim-bullseye"
ARG NODE_TAG="22-bookworm-slim"
ARG RUBY_TAG="3.4-slim-bookworm"

FROM node:$NODE_TAG AS node_base
FROM ruby:$RUBY_TAG
Expand Down
2 changes: 1 addition & 1 deletion 2025.1/base/rust.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUST_TAG="1.84-slim-bullseye"
ARG RUST_TAG="1.84-slim-bookworm"
FROM rust:$RUST_TAG

# renovate: datasource=npm depName=eslint
Expand Down
Loading
Loading