From bd972523a1b732aca1653f801fbd4643fd6532da Mon Sep 17 00:00:00 2001
From: tiulpin <viktor@tiulp.in>
Date: Thu, 21 Sep 2023 15:20:41 +0200
Subject: [PATCH] QD-7123 Bump tools versions

---
 2023.2/go/Dockerfile               | 2 +-
 2023.2/php/Dockerfile              | 4 ++--
 2023.2/python-community/Dockerfile | 8 +++++---
 2023.2/python/Dockerfile           | 8 +++++---
 docker-bake.hcl                    | 6 +++---
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/2023.2/go/Dockerfile b/2023.2/go/Dockerfile
index 95c3b844..88d49d2e 100644
--- a/2023.2/go/Dockerfile
+++ b/2023.2/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
diff --git a/2023.2/php/Dockerfile b/2023.2/php/Dockerfile
index 7145df4f..70d6e29b 100644
--- a/2023.2/php/Dockerfile
+++ b/2023.2/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
diff --git a/2023.2/python-community/Dockerfile b/2023.2/python-community/Dockerfile
index b2560f01..187ce0c5 100644
--- a/2023.2/python-community/Dockerfile
+++ b/2023.2/python-community/Dockerfile
@@ -37,7 +37,9 @@ ENV CONDA_DIR="/opt/miniconda3" \
     PIP_CACHE_DIR="$QODANA_DATA/cache/.pip/" \
     FLIT_ROOT_INSTALL=1
 ENV PATH="$CONDA_DIR/bin:$HOME/.local/bin:$PATH"
-ARG CONDA_VERSION="py310_22.11.1-1"
+
+# https://docs.conda.io/projects/miniconda/en/latest/miniconda-hashes.html
+ARG CONDA_VERSION="py311_23.5.2-0"
 
 # hadolint ignore=SC2174,DL3009
 RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
@@ -54,10 +56,10 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     case "$dpkgArch" in \
       'amd64')  \
         MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh" \
-        SHA256SUM="00938c3534750a0e4069499baf8f4e6dc1c2e471c86a59caa0dd03f4a9269db6";; \
+        SHA256SUM="634d76df5e489c44ade4085552b97bebc786d49245ed1a830022b0b406de5817";; \
       'arm64')  \
         MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-aarch64.sh"  \
-        SHA256SUM="48a96df9ff56f7421b6dd7f9f71d548023847ba918c3826059918c08326c2017";; \
+        SHA256SUM="3962738cfac270ae4ff30da0e382aecf6b3305a12064b196457747b157749a7a";; \
       *) echo "Unsupported architecture $TARGETPLATFORM" >&2; exit 1;; \
     esac && \
     curl -fsSL -o /tmp/miniconda.sh "${MINICONDA_URL}" && \
diff --git a/2023.2/python/Dockerfile b/2023.2/python/Dockerfile
index 6a46af0b..e4f7af06 100644
--- a/2023.2/python/Dockerfile
+++ b/2023.2/python/Dockerfile
@@ -37,7 +37,9 @@ ENV CONDA_DIR="/opt/miniconda3" \
     PIP_CACHE_DIR="$QODANA_DATA/cache/.pip/" \
     FLIT_ROOT_INSTALL=1
 ENV PATH="$CONDA_DIR/bin:$HOME/.local/bin:$PATH"
-ARG CONDA_VERSION="py310_22.11.1-1"
+
+# https://docs.conda.io/projects/miniconda/en/latest/miniconda-hashes.html
+ARG CONDA_VERSION="py311_23.5.2-0"
 
 # hadolint ignore=SC2174,DL3009
 RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
@@ -54,10 +56,10 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     case "$dpkgArch" in \
       'amd64')  \
         MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh" \
-        SHA256SUM="00938c3534750a0e4069499baf8f4e6dc1c2e471c86a59caa0dd03f4a9269db6";; \
+        SHA256SUM="634d76df5e489c44ade4085552b97bebc786d49245ed1a830022b0b406de5817";; \
       'arm64')  \
         MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-aarch64.sh"  \
-        SHA256SUM="48a96df9ff56f7421b6dd7f9f71d548023847ba918c3826059918c08326c2017";; \
+        SHA256SUM="3962738cfac270ae4ff30da0e382aecf6b3305a12064b196457747b157749a7a";; \
       *) echo "Unsupported architecture $TARGETPLATFORM" >&2; exit 1;; \
     esac && \
     curl -fsSL -o /tmp/miniconda.sh "${MINICONDA_URL}" && \
diff --git a/docker-bake.hcl b/docker-bake.hcl
index bcf3573d..1bd3a38d 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -12,10 +12,10 @@ target "232" {
     QD_RELEASE = "2023.2"
     BASE_TAG = "bullseye-slim"
     DOTNET_TAG = "6.0-bullseye-slim"
-    GO_TAG = "1.19-bullseye"
+    GO_TAG = "1.21-bullseye"
     NODE_TAG = "16-bullseye-slim"
-    PHP_TAG = "8.1-cli-bullseye"
-    COMPOSER_TAG="2.5.1"
+    PHP_TAG = "8.2-cli-bullseye"
+    COMPOSER_TAG="2.6.3"
   }
   tags = [
     "docker.io/jetbrains/qodana:${edition}-${version}-latest"