QD-7123 Ensure versions sync

JetBrains · Nov 23, 2023 · 0f64b26 · 0f64b26
1 parent 9b313bd
commit 0f64b26
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 34 deletions.
diff --git a/2023.2/android-community/Dockerfile b/2023.2/android-community/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \

diff --git a/2023.2/dotnet/Dockerfile b/2023.2/dotnet/Dockerfile
@@ -26,7 +26,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p $QODANA_DATA $QODANA_CONF $DOTNET_ROOT $RIDER_UNREAL_ROOT && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \

diff --git a/2023.2/go/Dockerfile b/2023.2/go/Dockerfile
@@ -21,7 +21,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \

diff --git a/2023.2/js/Dockerfile b/2023.2/js/Dockerfile
@@ -17,7 +17,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \

diff --git a/2023.2/jvm-community/Dockerfile b/2023.2/jvm-community/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \

diff --git a/2023.2/jvm/Dockerfile b/2023.2/jvm/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \

diff --git a/2023.2/php/Dockerfile b/2023.2/php/Dockerfile
@@ -21,7 +21,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \

diff --git a/2023.2/python-community/Dockerfile b/2023.2/python-community/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \

diff --git a/2023.2/python/Dockerfile b/2023.2/python/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \

diff --git a/2023.3/android-community/Dockerfile b/2023.3/android-community/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \
@@ -34,7 +34,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
 
 ENV GRADLE_USER_HOME="/data/cache/gradle"
 
-ARG QD_RELEASE="2023.2"
+ARG QD_RELEASE="2023.3"
 ARG QD_BUILD="QDANDC-$QD_RELEASE"
 # hadolint ignore=DL3003,SC2043
 RUN set -ex && \

diff --git a/2023.3/dotnet/Dockerfile b/2023.3/dotnet/Dockerfile
@@ -26,7 +26,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p $QODANA_DATA $QODANA_CONF $DOTNET_ROOT $RIDER_UNREAL_ROOT && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \
@@ -62,7 +62,7 @@ RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
     npm install -g [email protected] [email protected] && npm config set update-notifier false && \
     chmod 777 -R "$HOME/.npm" "$HOME/.npmrc"
 
-ARG QD_RELEASE="2023.2"
+ARG QD_RELEASE="2023.3"
 ARG QD_BUILD="QDNET-$QD_RELEASE"
 # hadolint ignore=DL3003,SC2043
 RUN set -ex && \

diff --git a/2023.3/go/Dockerfile b/2023.3/go/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_TAG="1.19-bullseye"
+ARG GO_TAG="1.21-bullseye"
 ARG NODE_TAG="16-bullseye-slim"
 FROM node:$NODE_TAG AS node_base
 FROM golang:$GO_TAG
@@ -12,14 +12,16 @@ ENV JAVA_HOME="$QODANA_DIST/jbr" \
     QODANA_CONF="$HOME/.config/idea" \
     PATH="$QODANA_DIST/bin:$PATH"
 
+ENV GOMODCACHE="$QODANA_DATA/cache/go"
+
 # hadolint ignore=SC2174,DL3009
 RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     --mount=target=/var/cache/apt,type=cache,sharing=locked \
     rm -f /etc/apt/apt.conf.d/docker-clean && \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \
@@ -46,7 +48,7 @@ RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
     npm install -g [email protected] [email protected] && npm config set update-notifier false && \
     chmod 777 -R "$HOME/.npm" "$HOME/.npmrc"
 
-ARG QD_RELEASE="2023.2"
+ARG QD_RELEASE="2023.3"
 ARG QD_BUILD="QDGO-$QD_RELEASE"
 # hadolint ignore=DL3003,SC2043
 RUN set -ex && \

diff --git a/2023.3/js/Dockerfile b/2023.3/js/Dockerfile
@@ -17,7 +17,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \
@@ -34,7 +34,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
 
 ENV PATH="/opt/yarn/bin:$PATH"
 
-ARG QD_RELEASE="2023.2"
+ARG QD_RELEASE="2023.3"
 ARG QD_BUILD="QDJVM-$QD_RELEASE"
 # hadolint ignore=DL3003,SC2043
 RUN set -ex && \

diff --git a/2023.3/jvm-community/Dockerfile b/2023.3/jvm-community/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \
@@ -34,7 +34,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
 
 ENV GRADLE_USER_HOME="/data/cache/gradle"
 
-ARG QD_RELEASE="2023.2"
+ARG QD_RELEASE="2023.3"
 ARG QD_BUILD="QDJVMC-$QD_RELEASE"
 # hadolint ignore=DL3003,SC2043
 RUN set -ex && \

diff --git a/2023.3/jvm/Dockerfile b/2023.3/jvm/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \
@@ -48,7 +48,7 @@ RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
 
 ENV GRADLE_USER_HOME="/data/cache/gradle"
 
-ARG QD_RELEASE="2023.2"
+ARG QD_RELEASE="2023.3"
 ARG QD_BUILD="QDJVM-$QD_RELEASE"
 # hadolint ignore=DL3003,SC2043
 RUN set -ex && \

diff --git a/2023.3/php/Dockerfile b/2023.3/php/Dockerfile
@@ -1,6 +1,6 @@
 ARG NODE_TAG="16-bullseye-slim"
-ARG PHP_TAG="8.1-cli-bullseye"
-ARG COMPOSER_TAG="2.5.1"
+ARG PHP_TAG="8.2-cli-bullseye"
+ARG COMPOSER_TAG="2.6.3"
 FROM node:$NODE_TAG AS node_base
 FROM composer:$COMPOSER_TAG AS composer_base
 FROM php:$PHP_TAG
@@ -21,7 +21,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \
@@ -51,7 +51,7 @@ RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
 
 COPY --from=composer_base /usr/bin/composer /usr/bin/composer
 
-ARG QD_RELEASE="2023.2"
+ARG QD_RELEASE="2023.3"
 ARG QD_BUILD="QDPHP-$QD_RELEASE"
 # hadolint ignore=DL3003,SC2043
 RUN set -ex && \

diff --git a/2023.3/python-community/Dockerfile b/2023.3/python-community/Dockerfile
@@ -15,11 +15,11 @@ ENV JAVA_HOME="$QODANA_DIST/jbr" \
 # hadolint ignore=SC2174,DL3009
 RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     --mount=target=/var/cache/apt,type=cache,sharing=locked \
-    rm -f /etc/apt/apt.conf.d/docker-clean &&  \
+    rm -f /etc/apt/apt.conf.d/docker-clean && \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \
@@ -34,10 +34,12 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
 
 ENV CONDA_DIR="/opt/miniconda3" \
     CONDA_ENVS_PATH="$QODANA_DATA/cache/conda/envs" \
-    CONDA_PKGS_DIRS="$QODANA_DATA/cache/conda/pkgs" \
     PIP_CACHE_DIR="$QODANA_DATA/cache/.pip/" \
+    POETRY_CACHE_DIR="$QODANA_DATA/cache/.poetry/" \
     FLIT_ROOT_INSTALL=1
 ENV PATH="$CONDA_DIR/bin:$HOME/.local/bin:$PATH"
+
+# https://docs.conda.io/projects/miniconda/en/latest/miniconda-hashes.html
 ARG CONDA_VERSION="py310_22.11.1-1"
 
 # hadolint ignore=SC2174,DL3009
@@ -70,9 +72,10 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     echo "conda activate base" >> ~/.bashrc && ln -s ${CONDA_DIR}/bin/python3 /usr/bin/python3 && \
     find ${CONDA_DIR}/ -follow -type f -name '*.a' -delete && find ${CONDA_DIR}/ -follow -type f -name '*.js.map' -delete && \
     ${CONDA_DIR}/bin/conda install -c conda-forge poetry pipenv && ${CONDA_DIR}/bin/conda clean -afy && \
+    chmod 777 -R $HOME/.conda && \
     rm -rf /tmp/*
 
-ARG QD_RELEASE="2023.2"
+ARG QD_RELEASE="2023.3"
 ARG QD_BUILD="QDPYC-$QD_RELEASE"
 # hadolint ignore=DL3003,SC2043
 RUN set -ex && \

diff --git a/2023.3/python/Dockerfile b/2023.3/python/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     mkdir -m 777 -p /opt $QODANA_DATA $QODANA_CONF && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates=20210119 \
-        curl=7.74.0-1.3+deb11u7 \
+        curl=7.74.0-1.3+deb11u10 \
         fontconfig=2.13.1-4.2 \
         git=1:2.30.2-1+deb11u2 \
         git-lfs=2.13.2-1+b5 \
@@ -34,16 +34,18 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
 
 ENV CONDA_DIR="/opt/miniconda3" \
     CONDA_ENVS_PATH="$QODANA_DATA/cache/conda/envs" \
-    CONDA_PKGS_DIRS="$QODANA_DATA/cache/conda/pkgs" \
     PIP_CACHE_DIR="$QODANA_DATA/cache/.pip/" \
+    POETRY_CACHE_DIR="$QODANA_DATA/cache/.poetry/" \
     FLIT_ROOT_INSTALL=1
 ENV PATH="$CONDA_DIR/bin:$HOME/.local/bin:$PATH"
+
+# https://docs.conda.io/projects/miniconda/en/latest/miniconda-hashes.html
 ARG CONDA_VERSION="py310_22.11.1-1"
 
 # hadolint ignore=SC2174,DL3009
 RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     --mount=target=/var/cache/apt,type=cache,sharing=locked \
-    apt-get update &&  \
+    apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
       bzip2=1.0.8-4 \
       libglib2.0-0=2.66.8-1 \
@@ -70,6 +72,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     echo "conda activate base" >> ~/.bashrc && ln -s ${CONDA_DIR}/bin/python3 /usr/bin/python3 && \
     find ${CONDA_DIR}/ -follow -type f -name '*.a' -delete && find ${CONDA_DIR}/ -follow -type f -name '*.js.map' -delete && \
     ${CONDA_DIR}/bin/conda install -c conda-forge poetry pipenv && ${CONDA_DIR}/bin/conda clean -afy && \
+    chmod 777 -R $HOME/.conda && \
     rm -rf /tmp/*
 
 ENV PATH="/opt/yarn/bin:$PATH"
@@ -86,7 +89,7 @@ RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
     npm install -g [email protected] [email protected] && npm config set update-notifier false && \
     chmod 777 -R "$HOME/.npm" "$HOME/.npmrc"
 
-ARG QD_RELEASE="2023.2"
+ARG QD_RELEASE="2023.3"
 ARG QD_BUILD="QDPY-$QD_RELEASE"
 # hadolint ignore=DL3003,SC2043
 RUN set -ex && \