diff --git a/Dockerfile b/Dockerfile index 1579fcdea10c79aa0031799e560365959ae6b108..49d8c818ed98a753c69f50b19232dd928643cc09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,6 @@ ARG FLUTTER_URL ARG FLUTTER_VERSION ARG DEPENDENCY_DIR ARG FLUTTER_DIR="$DEPENDENCY_DIR/flutter" -ARG TMP_DEPENDENCIES_DIR="$DEPENDENCY_DIR/tmp" -ARG GLIBC_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r1" ARG FLUTTER_DOWNLOAD_FILE="flutter.tar.xz" RUN apt update \ @@ -19,9 +17,6 @@ RUN mkdir -p ${FLUTTER_DIR} \ && wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz -O ${FLUTTER_DOWNLOAD_FILE} \ && tar -xf ${FLUTTER_DOWNLOAD_FILE} --strip-components=1 --directory $FLUTTER_DIR -RUN wget "$GLIBC_URL/glibc-2.35-r1.apk" --directory-prefix $TMP_DEPENDENCIES_DIR \ - && wget "$GLIBC_URL/glibc-bin-2.35-r1.apk" --directory-prefix $TMP_DEPENDENCIES_DIR - FROM alpine:3.20 @@ -35,9 +30,7 @@ ENV PATH=$PATH:$FLUTTER_HOME/bin COPY --from=download $DEPENDENCY_DIR / -RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \ - && apk add --no-cache --force-overwrite curl bash git tmp/glibc-2.35-r1.apk tmp/glibc-bin-2.35-r1.apk \ - && rm -r /tmp/* \ +RUN apk add --no-cache bash git gcompat \ && addgroup ${USERNAME} -g ${USER_GID} \ && adduser ${USERNAME} --uid ${USER_UID} --ingroup ${USERNAME} --disabled-password \ && chown -R ${USERNAME}:${USERNAME} ${FLUTTER_HOME}