From 3ffac11c3530da0f9c01a9da38e095f5793ed6a0 Mon Sep 17 00:00:00 2001 From: Michael Lazebnyi <62852417+hawkkiller@users.noreply.github.com> Date: Fri, 30 Dec 2022 01:24:13 +0200 Subject: [PATCH 1/4] Update docker-compose.yml --- docker-compose.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e2f3a60..3d1eb53 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,7 @@ services: # STABLE flutter-stable: - image: plugfox/flutter:stable + image: michaellazebny/flutter:stable build: dockerfile: dockerfiles/flutter.dockerfile context: . @@ -33,7 +33,7 @@ services: - VERSION=stable flutter-stable-web: - image: plugfox/flutter:stable-web + image: michaellazebny/flutter:stable-web build: dockerfile: dockerfiles/flutter_web.dockerfile context: . @@ -41,7 +41,7 @@ services: - VERSION=stable flutter-stable-android: - image: plugfox/flutter:stable-android + image: michaellazebny/flutter:stable-android build: dockerfile: dockerfiles/flutter_android.dockerfile context: . @@ -52,7 +52,7 @@ services: # BETA flutter-beta: - image: plugfox/flutter:beta + image: michaellazebny/flutter:beta build: dockerfile: dockerfiles/flutter.dockerfile context: . @@ -60,7 +60,7 @@ services: - VERSION=beta flutter-beta-web: - image: plugfox/flutter:beta-web + image: michaellazebny/flutter:beta-web build: dockerfile: dockerfiles/flutter_web.dockerfile context: . @@ -68,7 +68,7 @@ services: - VERSION=beta flutter-beta-android: - image: plugfox/flutter:beta-android + image: michaellazebny/flutter:beta-android build: dockerfile: dockerfiles/flutter_android.dockerfile context: . @@ -79,7 +79,7 @@ services: # MASTER flutter-master: - image: plugfox/flutter:master + image: michaellazebny/flutter:master build: dockerfile: dockerfiles/flutter.dockerfile context: . @@ -87,7 +87,7 @@ services: - VERSION=master flutter-master-web: - image: plugfox/flutter:master-web + image: michaellazebny/flutter:master-web build: dockerfile: dockerfiles/flutter_web.dockerfile context: . @@ -95,7 +95,7 @@ services: - VERSION=master flutter-master-android: - image: plugfox/flutter:master-android + image: michaellazebny/flutter:master-android build: dockerfile: dockerfiles/flutter_android.dockerfile context: . From 12ecf1bbee65d7b0d79fd2a0e82579d9c0e24f24 Mon Sep 17 00:00:00 2001 From: Michael Lazebnyi <62852417+hawkkiller@users.noreply.github.com> Date: Fri, 30 Dec 2022 12:53:49 +0200 Subject: [PATCH 2/4] Update flutter.dockerfile --- dockerfiles/flutter.dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dockerfiles/flutter.dockerfile b/dockerfiles/flutter.dockerfile index b182934..84818d5 100644 --- a/dockerfiles/flutter.dockerfile +++ b/dockerfiles/flutter.dockerfile @@ -116,9 +116,9 @@ RUN set -eux; mkdir -p /build; apk --no-cache add bash git curl unzip \ && dart --disable-analytics && flutter config --no-analytics \ && flutter doctor && flutter precache --universal -#RUN set -eux; git config --global user.email "flutter@dart.dev" \ -#&& git config --global user.name "Flutter" \ -#&& git config --global --add safe.directory /opt/flutter +RUN set -eux; git config --global user.email "flutter@dart.dev" \ +&& git config --global user.name "Flutter" \ +&& git config --global --add safe.directory /opt/flutter #ENV BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" From 5743a5f37ebfcbdc7e4bd1e665b0380a2cf28d16 Mon Sep 17 00:00:00 2001 From: Mihail Date: Fri, 30 Dec 2022 14:11:59 +0100 Subject: [PATCH 3/4] change plugfox author --- docker-compose.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3d1eb53..e2f3a60 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,7 @@ services: # STABLE flutter-stable: - image: michaellazebny/flutter:stable + image: plugfox/flutter:stable build: dockerfile: dockerfiles/flutter.dockerfile context: . @@ -33,7 +33,7 @@ services: - VERSION=stable flutter-stable-web: - image: michaellazebny/flutter:stable-web + image: plugfox/flutter:stable-web build: dockerfile: dockerfiles/flutter_web.dockerfile context: . @@ -41,7 +41,7 @@ services: - VERSION=stable flutter-stable-android: - image: michaellazebny/flutter:stable-android + image: plugfox/flutter:stable-android build: dockerfile: dockerfiles/flutter_android.dockerfile context: . @@ -52,7 +52,7 @@ services: # BETA flutter-beta: - image: michaellazebny/flutter:beta + image: plugfox/flutter:beta build: dockerfile: dockerfiles/flutter.dockerfile context: . @@ -60,7 +60,7 @@ services: - VERSION=beta flutter-beta-web: - image: michaellazebny/flutter:beta-web + image: plugfox/flutter:beta-web build: dockerfile: dockerfiles/flutter_web.dockerfile context: . @@ -68,7 +68,7 @@ services: - VERSION=beta flutter-beta-android: - image: michaellazebny/flutter:beta-android + image: plugfox/flutter:beta-android build: dockerfile: dockerfiles/flutter_android.dockerfile context: . @@ -79,7 +79,7 @@ services: # MASTER flutter-master: - image: michaellazebny/flutter:master + image: plugfox/flutter:master build: dockerfile: dockerfiles/flutter.dockerfile context: . @@ -87,7 +87,7 @@ services: - VERSION=master flutter-master-web: - image: michaellazebny/flutter:master-web + image: plugfox/flutter:master-web build: dockerfile: dockerfiles/flutter_web.dockerfile context: . @@ -95,7 +95,7 @@ services: - VERSION=master flutter-master-android: - image: michaellazebny/flutter:master-android + image: plugfox/flutter:master-android build: dockerfile: dockerfiles/flutter_android.dockerfile context: . From b2fdd2d44735e2f301e9910b0355689ee7b5e6ae Mon Sep 17 00:00:00 2001 From: Mihail Date: Fri, 30 Dec 2022 14:13:29 +0100 Subject: [PATCH 4/4] rm depth --- dockerfiles/flutter.dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dockerfiles/flutter.dockerfile b/dockerfiles/flutter.dockerfile index 84818d5..bd04a2a 100644 --- a/dockerfiles/flutter.dockerfile +++ b/dockerfiles/flutter.dockerfile @@ -44,7 +44,7 @@ RUN set -eux; mkdir -p /usr/lib /tmp/glibc $PUB_CACHE \ && rm -rf /var/lib/apt/lists/* /var/cache/apk/* # Install & config Flutter -RUN set -eux; git clone -b ${VERSION} --depth 1 "${FLUTTER_URL}.git" "${FLUTTER_ROOT}" \ +RUN set -eux; git clone -b ${VERSION} "${FLUTTER_URL}.git" "${FLUTTER_ROOT}" \ && cd "${FLUTTER_ROOT}" \ && git gc --prune=all @@ -117,8 +117,8 @@ RUN set -eux; mkdir -p /build; apk --no-cache add bash git curl unzip \ && flutter doctor && flutter precache --universal RUN set -eux; git config --global user.email "flutter@dart.dev" \ -&& git config --global user.name "Flutter" \ -&& git config --global --add safe.directory /opt/flutter + && git config --global user.name "Flutter" \ + && git config --global --add safe.directory /opt/flutter #ENV BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"