From 423dc7921dc8faf68cc27b69564ab87c27ddadd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ber=C3=A1nek?= Date: Mon, 22 May 2023 13:30:12 +0200 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20debian,=20gradle?= =?UTF-8?q?=20and=20kotlin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.MD | 8 ++++++++ Dockerfile | 9 +++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 8f4bb1c..ab7549c 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v2.0.0] - 2023-05-22 +### Changed +- Debian `stretch` to `buster` due to apt mirror missing packages +- Updated danger to work with current gradle +- Updated kotlin +### Add +- Exception for root build of `/opt/flutter` to avoid `flutter doctor` error + ## [v1.4.0] - 2023-05-22 ### Changed - Update to Java 17 diff --git a/Dockerfile b/Dockerfile index e05bd65..4b73126 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM debian:buster LABEL tag="ackee-gitlab" \ author="Ackee 🦄" \ @@ -79,16 +79,16 @@ RUN apt-get update && apt-get install -y \ make # install danger-js which is needed for danger-kotlin to work -RUN npm install -g danger@10.2.1 +RUN npm install -g danger@11.2.6 # install kotlin compiler -RUN curl -o kotlin-compiler.zip -L https://github.com/JetBrains/kotlin/releases/download/v1.4.10/kotlin-compiler-1.4.10.zip && \ +RUN curl -o kotlin-compiler.zip -L https://github.com/JetBrains/kotlin/releases/download/v1.8.21/kotlin-compiler-1.8.21.zip && \ unzip -d /usr/local/ kotlin-compiler.zip && \ rm -rf kotlin-compiler.zip # install danger-kotlin RUN git clone https://github.com/danger/kotlin.git _danger-kotlin && \ - cd _danger-kotlin && git checkout 0.7.1 && \ + cd _danger-kotlin && git checkout 1.2.0 && \ make install && \ cd .. && \ rm -rf _danger-kotlin @@ -105,6 +105,7 @@ ENV FLUTTER_HOME="/opt/flutter" RUN curl -o flutter.tar.xz $FLUTTER_URL \ && mkdir -p $FLUTTER_HOME \ && tar xf flutter.tar.xz -C /opt \ + && git config --global --add safe.directory /opt/flutter \ && rm flutter.tar.xz ENV PATH=$PATH:$FLUTTER_HOME/bin