From a3c3c3617e61f7512a29efd0e65a63b9dd3ee0d9 Mon Sep 17 00:00:00 2001 From: tiulpin Date: Wed, 17 Jan 2024 02:55:52 +0100 Subject: [PATCH 1/2] QD-6773 Fix `.m2` permissions for JVM linters --- 2023.3/android-community/Dockerfile | 3 ++- 2023.3/base/debian.Dockerfile | 3 ++- 2023.3/base/debian.js.Dockerfile | 3 ++- 2023.3/jvm-community/Dockerfile | 3 ++- 2023.3/jvm/Dockerfile | 3 ++- next/base/debian.Dockerfile | 3 ++- next/base/debian.js.Dockerfile | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/2023.3/android-community/Dockerfile b/2023.3/android-community/Dockerfile index a0b9c01e..a704ba8d 100644 --- a/2023.3/android-community/Dockerfile +++ b/2023.3/android-community/Dockerfile @@ -30,7 +30,8 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \ apt-get autoremove -y && apt-get clean && \ chmod 777 -R $HOME && \ echo 'root:x:0:0:root:/root:/bin/bash' > /etc/passwd && chmod 666 /etc/passwd && \ - git config --global --add safe.directory '*' + git config --global --add safe.directory '*' && \ + mkdir -p -m 777 "$HOME/.m2" "$HOME/.m2/repository" ENV GRADLE_USER_HOME="/data/cache/gradle" diff --git a/2023.3/base/debian.Dockerfile b/2023.3/base/debian.Dockerfile index 45f867b1..5032c8d0 100644 --- a/2023.3/base/debian.Dockerfile +++ b/2023.3/base/debian.Dockerfile @@ -30,4 +30,5 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \ apt-get autoremove -y && apt-get clean && \ chmod 777 -R $HOME && \ echo 'root:x:0:0:root:/root:/bin/bash' > /etc/passwd && chmod 666 /etc/passwd && \ - git config --global --add safe.directory '*' \ No newline at end of file + git config --global --add safe.directory '*' && \ + mkdir -p -m 777 "$HOME/.m2" "$HOME/.m2/repository" \ No newline at end of file diff --git a/2023.3/base/debian.js.Dockerfile b/2023.3/base/debian.js.Dockerfile index af5b1964..0d2766ec 100644 --- a/2023.3/base/debian.js.Dockerfile +++ b/2023.3/base/debian.js.Dockerfile @@ -14,4 +14,5 @@ RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \ npm --version && \ yarn --version && \ npm install -g eslint@v8.47.0 pnpm@v8.7.1 && npm config set update-notifier false && \ - chmod 777 -R "$HOME/.npm" "$HOME/.npmrc" \ No newline at end of file + chmod 777 -R "$HOME/.npm" "$HOME/.npmrc" && \ + mkdir -p -m 777 "$HOME/.m2" "$HOME/.m2/repository" \ No newline at end of file diff --git a/2023.3/jvm-community/Dockerfile b/2023.3/jvm-community/Dockerfile index 21117a66..a9d514be 100644 --- a/2023.3/jvm-community/Dockerfile +++ b/2023.3/jvm-community/Dockerfile @@ -30,7 +30,8 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \ apt-get autoremove -y && apt-get clean && \ chmod 777 -R $HOME && \ echo 'root:x:0:0:root:/root:/bin/bash' > /etc/passwd && chmod 666 /etc/passwd && \ - git config --global --add safe.directory '*' + git config --global --add safe.directory '*' && \ + mkdir -p -m 777 "$HOME/.m2" "$HOME/.m2/repository" ENV GRADLE_USER_HOME="/data/cache/gradle" diff --git a/2023.3/jvm/Dockerfile b/2023.3/jvm/Dockerfile index 202ceb2c..e2fd335a 100644 --- a/2023.3/jvm/Dockerfile +++ b/2023.3/jvm/Dockerfile @@ -30,7 +30,8 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \ apt-get autoremove -y && apt-get clean && \ chmod 777 -R $HOME && \ echo 'root:x:0:0:root:/root:/bin/bash' > /etc/passwd && chmod 666 /etc/passwd && \ - git config --global --add safe.directory '*' + git config --global --add safe.directory '*' && \ + mkdir -p -m 777 "$HOME/.m2" "$HOME/.m2/repository" ENV PATH="/opt/yarn/bin:$PATH" COPY --from=node_base /usr/local/bin/node /usr/local/bin/ diff --git a/next/base/debian.Dockerfile b/next/base/debian.Dockerfile index 45f867b1..5032c8d0 100644 --- a/next/base/debian.Dockerfile +++ b/next/base/debian.Dockerfile @@ -30,4 +30,5 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \ apt-get autoremove -y && apt-get clean && \ chmod 777 -R $HOME && \ echo 'root:x:0:0:root:/root:/bin/bash' > /etc/passwd && chmod 666 /etc/passwd && \ - git config --global --add safe.directory '*' \ No newline at end of file + git config --global --add safe.directory '*' && \ + mkdir -p -m 777 "$HOME/.m2" "$HOME/.m2/repository" \ No newline at end of file diff --git a/next/base/debian.js.Dockerfile b/next/base/debian.js.Dockerfile index af5b1964..0d2766ec 100644 --- a/next/base/debian.js.Dockerfile +++ b/next/base/debian.js.Dockerfile @@ -14,4 +14,5 @@ RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \ npm --version && \ yarn --version && \ npm install -g eslint@v8.47.0 pnpm@v8.7.1 && npm config set update-notifier false && \ - chmod 777 -R "$HOME/.npm" "$HOME/.npmrc" \ No newline at end of file + chmod 777 -R "$HOME/.npm" "$HOME/.npmrc" && \ + mkdir -p -m 777 "$HOME/.m2" "$HOME/.m2/repository" \ No newline at end of file From cb42dd9aca51d5cf0abf1e50091bc5e442762c85 Mon Sep 17 00:00:00 2001 From: tiulpin Date: Wed, 17 Jan 2024 02:56:09 +0100 Subject: [PATCH 2/2] QD-8148 Update dependabot config --- .github/dependabot.yml | 93 +++++++++++++++++++++++++++++++++++++- .github/workflows/base.yml | 2 +- 2 files changed, 92 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f4ffde79..ad793128 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,9 +10,8 @@ updates: dependencies: patterns: - "*" - - package-ecosystem: docker - directory: /next/ + directory: /next/android-community commit-message: prefix: "QD-8148" schedule: @@ -21,3 +20,93 @@ updates: dependencies: patterns: - "*" + - package-ecosystem: docker + directory: /next/dotnet + commit-message: + prefix: "QD-8148" + schedule: + interval: weekly + groups: + dependencies: + patterns: + - "*" + - package-ecosystem: docker + directory: /next/dotnet-community + commit-message: + prefix: "QD-8148" + schedule: + interval: weekly + groups: + dependencies: + patterns: + - "*" + - package-ecosystem: docker + directory: /next/go + commit-message: + prefix: "QD-8148" + schedule: + interval: weekly + groups: + dependencies: + patterns: + - "*" + - package-ecosystem: docker + directory: /next/js + commit-message: + prefix: "QD-8148" + schedule: + interval: weekly + groups: + dependencies: + patterns: + - "*" + - package-ecosystem: docker + directory: /next/jvm + commit-message: + prefix: "QD-8148" + schedule: + interval: weekly + groups: + dependencies: + patterns: + - "*" + - package-ecosystem: docker + directory: /next/jvm-community + commit-message: + prefix: "QD-8148" + schedule: + interval: weekly + groups: + dependencies: + patterns: + - "*" + - package-ecosystem: docker + directory: /next/php + commit-message: + prefix: "QD-8148" + schedule: + interval: weekly + groups: + dependencies: + patterns: + - "*" + - package-ecosystem: docker + directory: /next/python + commit-message: + prefix: "QD-8148" + schedule: + interval: weekly + groups: + dependencies: + patterns: + - "*" + - package-ecosystem: docker + directory: /next/python-community + commit-message: + prefix: "QD-8148" + schedule: + interval: weekly + groups: + dependencies: + patterns: + - "*" \ No newline at end of file diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index 891dabc7..28cf516a 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -35,5 +35,5 @@ jobs: - name: Build and push uses: docker/bake-action@v4 with: - push: github.ref == 'refs/heads/main' + push: ${{ github.ref == 'refs/heads/main' }} workdir: ${{ matrix.version }}/base \ No newline at end of file