Skip to content

Commit bb4958f

Browse files
committed
Refactor dockerfile
1 parent 091beb1 commit bb4958f

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

Dockerfile

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ RUN curl -s "https://get.sdkman.io" | bash && \
2525
sdk install java 17.0.7-oracle && \
2626
sdk use java 17.0.7-oracle
2727

28-
ENV JAVA_HOME /root/.sdkman/candidates/java/current
29-
ENV ANDROID_HOME /opt/android-sdk-linux
30-
ENV PATH "$PATH:$JAVA_HOME/bin"
28+
ENV JAVA_HOME=/root/.sdkman/candidates/java/current
29+
ENV ANDROID_HOME=/opt/android-sdk-linux
30+
ENV PATH="$PATH:$JAVA_HOME/bin"
3131

3232
# Download Android SDK command line tools into $ANDROID_HOME
3333
RUN cd /opt && wget -q https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -O android-sdk-tools.zip && \
3434
unzip -q android-sdk-tools.zip && mkdir -p "$ANDROID_HOME/cmdline-tools/" && mv cmdline-tools latest && mv latest/ "$ANDROID_HOME"/cmdline-tools/ && \
3535
rm android-sdk-tools.zip
3636

37-
ENV PATH "$PATH:$ANDROID_HOME/cmdline-tools/latest:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools"
37+
ENV PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools"
3838

3939
# Accept licenses before installing components
4040
# License is valid for all the standard components in versions installed from this file
@@ -51,7 +51,7 @@ RUN sdkmanager $(sdkmanager --list 2> /dev/null | grep build-tools | awk -F' ' '
5151
# setup gcloud
5252
RUN echo "deb https://packages.cloud.google.com/apt cloud-sdk main" >> /etc/apt/sources.list.d/google-cloud-sdk.list && \
5353
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor >> /etc/apt/trusted.gpg.d/cloud.google.gpg && \
54-
apt-get update && apt-get install -y google-cloud-cli && \
54+
apt update && apt install -y google-cloud-cli && \
5555
gcloud config set component_manager/disable_update_check true
5656

5757
# nvm environment variables
@@ -73,7 +73,7 @@ ENV NODE_PATH=$NVM_DIR/v$NODE_VERSION/lib/node_modules \
7373
PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
7474

7575
# install make which is needed in danger-kotlin install phase
76-
RUN apt-get update && apt-get install -y \
76+
RUN apt update && apt install -y \
7777
make
7878

7979
# install danger-js which is needed for danger-kotlin to work
@@ -99,12 +99,13 @@ ENV FLUTTER_CHANNEL="stable"
9999
ENV FLUTTER_VERSION="3.24.3"
100100
ENV FLUTTER_URL="https://storage.googleapis.com/flutter_infra_release/releases/$FLUTTER_CHANNEL/linux/flutter_linux_$FLUTTER_VERSION-$FLUTTER_CHANNEL.tar.xz"
101101
ENV FLUTTER_HOME="/opt/flutter"
102+
ENV FLUTTER_FILE="flutter.tar.xz"
102103

103-
RUN curl -o flutter.tar.xz $FLUTTER_URL \
104+
RUN curl -o $FLUTTER_FILE $FLUTTER_URL \
104105
&& mkdir -p $FLUTTER_HOME \
105-
&& tar xf flutter.tar.xz -C /opt \
106+
&& tar xf $FLUTTER_FILE -C /opt \
106107
&& git config --global --add safe.directory /opt/flutter \
107-
&& rm flutter.tar.xz
108+
&& rm $FLUTTER_FILE
108109

109110
ENV PATH=$PATH:$FLUTTER_HOME/bin
110111

@@ -116,11 +117,11 @@ RUN flutter config --no-analytics \
116117

117118
# git LFS support
118119
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash \
119-
&& apt-get install -y git-lfs \
120+
&& apt install -y git-lfs \
120121
&& git lfs install
121122

122123
# add gitlab helper functions
123-
ENV GITLAB_CI_UTILS_VERSION 2.7.0
124+
ENV GITLAB_CI_UTILS_VERSION=2.7.0
124125
RUN curl -o helper_functions.sh "https://raw.githubusercontent.com/AckeeDevOps/gitlab-ci-utils/$GITLAB_CI_UTILS_VERSION/scripts/helper_functions.sh" \
125126
&& curl -o android_ci_functions.sh "https://raw.githubusercontent.com/AckeeCZ/android-gitlab-ci-scripts/v1.0.0/android_ci_functions.sh" \
126127
&& echo "source helper_functions.sh" >> /etc/profile \

0 commit comments

Comments
 (0)