diff --git a/.vscode/jenkins-ssh-docker-agent.code-workspace b/.vscode/jenkins-ssh-docker-agent.code-workspace new file mode 100644 index 0000000..bab1b7f --- /dev/null +++ b/.vscode/jenkins-ssh-docker-agent.code-workspace @@ -0,0 +1,8 @@ +{ + "folders": [ + { + "path": ".." + } + ], + "settings": {} +} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index c0d6a07..609686c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,18 +4,17 @@ RUN groupadd -g 281 docker RUN usermod -aG docker jenkins RUN apt-get update -RUN apt-get install -y\ - ca-certificates \ - curl \ - gnupg +RUN apt-get install -y ca-certificates \ + curl \ + gnupg RUN mkdir -m 0755 -p /etc/apt/keyrings RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg RUN echo \ "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \ - "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \ - tee /etc/apt/sources.list.d/docker.list > /dev/null + "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | + tee /etc/apt/sources.list.d/docker.list >/dev/null RUN apt-get update RUN apt-get install -y docker-ce-cli @@ -26,8 +25,7 @@ RUN apt-get install -y docker-ce-cli # RUN cd tea && make && make install # Install flutter -RUN apt-get install -y\ - curl git wget \ +RUN apt-get install -y curl git wget \ unzip libgconf-2-4 gdb \ libstdc++6 libglu1-mesa fonts-droid-fallback \ lib32stdc++6 python3 sed @@ -48,7 +46,7 @@ RUN flutter channel master RUN flutter upgrade RUN dart pub global activate flutter_distributor -RUN echo 'export PATH="$PATH:`dart pub global path`"' >> ~/.bashrc +RUN echo 'export PATH="$PATH:`dart pub global path`"' >>~/.bashrc USER root @@ -57,4 +55,4 @@ RUN apt-get install -y openssl #Install git lfs RUN apt-get install -y git-lfs -RUN git lfs install --system \ No newline at end of file +RUN git lfs install --system diff --git a/alpine/Dockerfile b/alpine/Dockerfile index a5dde96..cf312d8 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -8,8 +8,18 @@ RUN apk add --no-cache docker docker-compose # Install tea RUN apk add --no-cache tea +# Install glibc compatibility for Flutter/Dart +RUN apk --no-cache add ca-certificates wget +RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub +RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.34-r0/glibc-2.34-r0.apk +RUN apk add --force-overwrite glibc-2.34-r0.apk +RUN rm glibc-2.34-r0.apk + +# Install flutter dependencies +RUN apk --no-cache add bash curl git unzip libstdc++ + # Install flutter -RUN apk --no-cache add bash curl git ca-certificates wget unzip +RUN apk --no-cache add bash curl git ca-certificates wget unzip RUN git clone https://github.com/flutter/flutter.git /usr/local/flutter RUN git config --global --add safe.directory /usr/local/flutter @@ -25,7 +35,7 @@ RUN flutter channel master RUN flutter upgrade RUN dart pub global activate flutter_distributor -RUN echo 'export PATH="$PATH:`dart pub global path`"' >> /etc/profile +RUN echo 'export PATH="$PATH:`dart pub global path`"' >>/etc/profile USER root @@ -34,4 +44,4 @@ RUN apk add --no-cache openssl #Install git lfs RUN apk add --no-cache git-lfs -RUN git lfs install --system \ No newline at end of file +RUN git lfs install --system