Add GCC_FILE variable for easier gcc install

akospasztor · Jun 22, 2024 · 8337aae · 8337aae
1 parent 89bb960
commit 8337aae
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/10-2020-q4/linux/Dockerfile b/10-2020-q4/linux/Dockerfile
@@ -15,12 +15,13 @@ RUN apt-get update && apt-get -y -q --no-install-recommends install \
 # Install GCC for ARM
 ENV GCC_VERSION=10-2020-q4
 ENV GCC_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
-RUN wget --progress=dot:mega -O /tmp/$GCC_VERSION.tar.bz2 $GCC_URL
+ENV GCC_FILE=/tmp/gcc-$GCC_VERSION.tar.bz2
+RUN wget --progress=dot:mega -O $GCC_FILE $GCC_URL
 
 ENV GCC_DIR=/opt/gcc/$GCC_VERSION
 RUN mkdir -p $GCC_DIR
-RUN tar xjf /tmp/$GCC_VERSION.tar.bz2 -C $GCC_DIR --strip-components=1
-RUN rm -f /tmp/$GCC_VERSION.tar.bz2
+RUN tar xjf $GCC_FILE -C $GCC_DIR --strip-components=1
+RUN rm -f $GCC_FILE
 
 ENV GCC_PATH=$GCC_DIR/bin
 ENV PATH=$GCC_PATH:$PATH
diff --git a/8-2019-q3/linux/Dockerfile b/8-2019-q3/linux/Dockerfile
@@ -15,12 +15,13 @@ RUN apt-get update && apt-get -y -q --no-install-recommends install \
 # Install GCC for ARM
 ENV GCC_VERSION=8-2019-q3
 ENV GCC_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/8-2019q3/RC1.1/gcc-arm-none-eabi-8-2019-q3-update-linux.tar.bz2
-RUN wget --progress=dot:mega -O /tmp/$GCC_VERSION.tar.bz2 $GCC_URL
+ENV GCC_FILE=/tmp/gcc-$GCC_VERSION.tar.bz2
+RUN wget --progress=dot:mega -O $GCC_FILE $GCC_URL
 
 ENV GCC_DIR=/opt/gcc/$GCC_VERSION
 RUN mkdir -p $GCC_DIR
-RUN tar xjf /tmp/$GCC_VERSION.tar.bz2 -C $GCC_DIR --strip-components=1
-RUN rm -f /tmp/$GCC_VERSION.tar.bz2
+RUN tar xjf $GCC_FILE -C $GCC_DIR --strip-components=1
+RUN rm -f $GCC_FILE
 
 ENV GCC_PATH=$GCC_DIR/bin
 ENV PATH=$GCC_PATH:$PATH
diff --git a/9-2019-q4/linux/Dockerfile b/9-2019-q4/linux/Dockerfile
@@ -15,12 +15,13 @@ RUN apt-get update && apt-get -y -q --no-install-recommends install \
 # Install GCC for ARM
 ENV GCC_VERSION=9-2019-q4
 ENV GCC_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
-RUN wget --progress=dot:mega -O /tmp/$GCC_VERSION.tar.bz2 $GCC_URL
+ENV GCC_FILE=/tmp/gcc-$GCC_VERSION.tar.bz2
+RUN wget --progress=dot:mega -O $GCC_FILE $GCC_URL
 
 ENV GCC_DIR=/opt/gcc/$GCC_VERSION
 RUN mkdir -p $GCC_DIR
-RUN tar xjf /tmp/$GCC_VERSION.tar.bz2 -C $GCC_DIR --strip-components=1
-RUN rm -f /tmp/$GCC_VERSION.tar.bz2
+RUN tar xjf $GCC_FILE -C $GCC_DIR --strip-components=1
+RUN rm -f $GCC_FILE
 
 ENV GCC_PATH=$GCC_DIR/bin
 ENV PATH=$GCC_PATH:$PATH
diff --git a/9-2020-q2/linux/Dockerfile b/9-2020-q2/linux/Dockerfile
@@ -15,12 +15,13 @@ RUN apt-get update && apt-get -y -q --no-install-recommends install \
 # Install GCC for ARM
 ENV GCC_VERSION=9-2020-q2
 ENV GCC_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2
-RUN wget --progress=dot:mega -O /tmp/$GCC_VERSION.tar.bz2 $GCC_URL
+ENV GCC_FILE=/tmp/gcc-$GCC_VERSION.tar.bz2
+RUN wget --progress=dot:mega -O $GCC_FILE $GCC_URL
 
 ENV GCC_DIR=/opt/gcc/$GCC_VERSION
 RUN mkdir -p $GCC_DIR
-RUN tar xjf /tmp/$GCC_VERSION.tar.bz2 -C $GCC_DIR --strip-components=1
-RUN rm -f /tmp/$GCC_VERSION.tar.bz2
+RUN tar xjf $GCC_FILE -C $GCC_DIR --strip-components=1
+RUN rm -f $GCC_FILE
 
 ENV GCC_PATH=$GCC_DIR/bin
 ENV PATH=$GCC_PATH:$PATH