Docker, travis, vagrant: update GCC

BitBoxSwiss · Sep 9, 2019 · 560a82c · 560a82c
1 parent 9c7ede8
commit 560a82c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -40,9 +40,9 @@ install:
           export PATH=$PATH:$PWD/bin/;
           cd ../../..;
     - if [ "$TEST" = "no" ]; then
-          wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/8-2018q4/gcc-arm-none-eabi-8-2018-q4-major-linux.tar.bz2;
-          tar -xf gcc-arm-none-eabi-8-2018-q4-major-linux.tar.bz2;
-          export PATH=$PATH:$PWD/gcc-arm-none-eabi-8-2018-q4-major/bin;
+          wget -O gcc.tar.bz2 https://developer.arm.com/-/media/Files/downloads/gnu-rm/8-2019q3/RC1.1/gcc-arm-none-eabi-8-2019-q3-update-linux.tar.bz2;
+          tar -xf gcc.tar.bz2;
+          export PATH=$PATH:$PWD/gcc-arm-none-eabi-8-2019-q3-update/bin;
       fi;
     - if [ "$TEST" = "yes" ]; then
           sudo apt-get update;

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -27,9 +27,9 @@
 FROM debian:stretch
 
 RUN apt update && apt-get install -y cmake git wget locales python python-pip
-RUN mkdir ~/Downloads && cd ~/Downloads && wget -O gcc.tar.bz2 https://developer.arm.com/-/media/Files/downloads/gnu-rm/8-2018q4/gcc-arm-none-eabi-8-2018-q4-major-linux.tar.bz2
+RUN mkdir ~/Downloads && cd ~/Downloads && wget -O gcc.tar.bz2 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 cd ~/Downloads && tar -xjvf gcc.tar.bz2
-RUN cd ~/Downloads && rsync -a gcc-arm-none-eabi-7-2018-q2-update/ /usr/local/
+RUN cd ~/Downloads && rsync -a gcc-arm-none-eabi-8-2019-q3-update/ /usr/local/
 RUN apt install -y libbz2-1.0 libncurses5 libz1 valgrind astyle clang libudev-dev python-urllib3 libssl1.0-dev
 RUN apt install -y libbz2-dev libbz2-dev libbz2-1.0 libncurses5 libz1 valgrind astyle clang libudev-dev python-urllib3
 RUN pip install --prefix /usr/local  cpp-coveralls

diff --git a/Vagrantfile b/Vagrantfile
@@ -7,9 +7,9 @@ Vagrant.configure(2) do |config|
   config.vm.provision "shell", privileged: false, inline: <<-SHELL
     sudo locale-gen UTF-8
     sudo apt update && sudo apt-get install -y cmake git
-    wget -O gcc.tar.bz2 https://developer.arm.com/-/media/Files/downloads/gnu-rm/8-2018q4/gcc-arm-none-eabi-8-2018-q4-major-linux.tar.bz2;
+    wget -O gcc.tar.bz2 https://developer.arm.com/-/media/Files/downloads/gnu-rm/8-2019q3/RC1.1/gcc-arm-none-eabi-8-2019-q3-update-linux.tar.bz2
     tar -xf gcc.tar.bz2
-    sudo rsync -a gcc-arm-none-eabi-8-2018-q4-major/ /usr/local/
+    sudo rsync -a gcc-arm-none-eabi-8-2019-q3-update/ /usr/local/
   SHELL
 
   config.vm.provision "shell", run: "always", privileged: false, inline: <<-SHELL

diff --git a/dockerdev.sh b/dockerdev.sh
@@ -35,7 +35,7 @@ dockerdev () {
 
     # If already running, enter the container.
     if docker ps | grep -q $container_name; then
-        docker exec -it $container_name bash
+        docker exec --user=dockeruser --workdir=/app -it $container_name bash
         return
     fi
 
@@ -52,6 +52,11 @@ dockerdev () {
            -v $repo_path:/app \
            $container_image bash
 
+    # Use same user/group id as on the host, so that files are not created as root in the mounted
+    # volume.
+    docker exec -it $container_name groupadd -g `id -g` dockergroup
+    docker exec -it $container_name useradd -u `id -u` -m -g dockergroup dockeruser
+
     # Call a second time to enter the container.
     dockerdev
 }