From 1a0e9b6a4d9d12d9dfefcc91f367d80ab24ff21c Mon Sep 17 00:00:00 2001
From: Balazs Eszes <c4deszes@gmail.com>
Date: Sun, 28 Jan 2024 10:25:05 +0100
Subject: [PATCH 01/10] Updating tool versions

---
 Dockerfile | 16 ++++++++--------
 README.md  |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e6c3a99..35bfae1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu
 
-LABEL version="1.0.0"
+LABEL version="1.1.0"
 LABEL description="Image for building ARM embedded projects"
 
 # Install common tools
@@ -9,10 +9,10 @@ RUN apt-get install -y \
       build-essential \
       git \
       curl \
-	  wget
+      wget
 
 # Install CMake
-ARG cmake_version="3.20.2"
+ARG cmake_version="3.28.1"
 ARG cmake_platform="linux-x86_64"
 
 RUN mkdir /opt/cmake
@@ -21,15 +21,15 @@ RUN sh cmake-${cmake_version}-${cmake_platform}.sh --prefix=/opt/cmake --skip-li
 ENV PATH "$PATH:/opt/cmake/bin"
 
 # Install Python
-RUN apt-get install -y python3.9
+RUN apt-get install -y python3.12
 
 # ARM GCC configuration
-ARG arm_archive="10-2020q4"
-ARG arm_version="10-2020-q4-major"
-ARG arm_platform="x86_64-linux"
+ARG arm_archive="13.2.rel1"
+ARG arm_version="13.2.rel1"
+ARG arm_platform="x86_64-aarch64-none-linux-gnu"
 
 # Install ARM GCC
 RUN mkdir /opt/armgcc
-RUN wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/${arm_archive}/gcc-arm-none-eabi-${arm_version}-${arm_platform}.tar.bz2
+RUN wget https://developer.arm.com/-/media/Files/downloads/gnu/${arm_archive}/binrel/arm-gnu-toolchain-${arm_version}-${arm_platform}.tar.xz
 RUN tar -xf gcc-arm-none-eabi-${arm_version}-${arm_platform}.tar.bz2 --directory /opt/armgcc
 ENV PATH "$PATH:/opt/armgcc/gcc-arm-none-eabi-${arm_version}/bin"
diff --git a/README.md b/README.md
index e033c28..0287eb5 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,10 @@
 
 ## Tools
 
-+ CMake 3.20.2
-+ Python 3.9
++ CMake 3.28.1
++ Python 3.12
 + GCC 9.0
-+ ARM GCC 10.0 (2020 Q4)
++ ARM GCC 13.2-rel1
 
 ---
 

From fac7b4614157d1bda702add757b765831c59c3ea Mon Sep 17 00:00:00 2001
From: Balazs Eszes <c4deszes@gmail.com>
Date: Sun, 28 Jan 2024 10:35:52 +0100
Subject: [PATCH 02/10] Reverting to default Python

---
 .github/workflows/build.yml | 9 +++++++++
 Dockerfile                  | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6f82158..2010efa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,3 +15,12 @@ jobs:
 
       - name: Build image
         run: docker build . -t local
+
+      - name: Test Python version
+        run: docker run -it local python --version
+
+      - name: Test CMake version
+        run: docker run -it local cmake --version
+
+      - name: Test ARM compiler version
+        run: docker run -it local arm-none-eabi-gcc --version
diff --git a/Dockerfile b/Dockerfile
index 35bfae1..706973e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu
+FROM ubuntu:23.04
 
 LABEL version="1.1.0"
 LABEL description="Image for building ARM embedded projects"
@@ -21,7 +21,7 @@ RUN sh cmake-${cmake_version}-${cmake_platform}.sh --prefix=/opt/cmake --skip-li
 ENV PATH "$PATH:/opt/cmake/bin"
 
 # Install Python
-RUN apt-get install -y python3.12
+# RUN apt-get install -y python3.11
 
 # ARM GCC configuration
 ARG arm_archive="13.2.rel1"

From 9c4ab54c19347b3c490a9eb962a20839025161ff Mon Sep 17 00:00:00 2001
From: Balazs Eszes <c4deszes@gmail.com>
Date: Sun, 28 Jan 2024 10:40:46 +0100
Subject: [PATCH 03/10] Fix ARM path names

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 706973e..b737a0a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,10 +26,11 @@ ENV PATH "$PATH:/opt/cmake/bin"
 # ARM GCC configuration
 ARG arm_archive="13.2.rel1"
 ARG arm_version="13.2.rel1"
+ARG arm_folder="13.2.Rel1"
 ARG arm_platform="x86_64-aarch64-none-linux-gnu"
 
 # Install ARM GCC
 RUN mkdir /opt/armgcc
 RUN wget https://developer.arm.com/-/media/Files/downloads/gnu/${arm_archive}/binrel/arm-gnu-toolchain-${arm_version}-${arm_platform}.tar.xz
-RUN tar -xf gcc-arm-none-eabi-${arm_version}-${arm_platform}.tar.bz2 --directory /opt/armgcc
-ENV PATH "$PATH:/opt/armgcc/gcc-arm-none-eabi-${arm_version}/bin"
+RUN tar -xf arm-gnu-toolchain-${arm_version}-${arm_platform}.tar.xz --directory /opt/armgcc
+ENV PATH "$PATH:/opt/armgcc/arm-gnu-toolchain-${arm_folder}-${arm_platform}/bin"

From c9bf6967c09b865d42ac796aa9aecf448204367a Mon Sep 17 00:00:00 2001
From: Balazs Eszes <c4deszes@gmail.com>
Date: Sun, 28 Jan 2024 10:43:34 +0100
Subject: [PATCH 04/10] Fix test

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2010efa..f4ea3e2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,10 +17,10 @@ jobs:
         run: docker build . -t local
 
       - name: Test Python version
-        run: docker run -it local python --version
+        run: docker run local python --version
 
       - name: Test CMake version
-        run: docker run -it local cmake --version
+        run: docker run local cmake --version
 
       - name: Test ARM compiler version
-        run: docker run -it local arm-none-eabi-gcc --version
+        run: docker run local arm-none-eabi-gcc --version

From 4b7e8cb17704fd53481cc4ced00d6285f2752c1a Mon Sep 17 00:00:00 2001
From: Balazs Eszes <c4deszes@gmail.com>
Date: Sun, 28 Jan 2024 10:47:20 +0100
Subject: [PATCH 05/10] Python alias

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index b737a0a..4e03464 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,6 +22,7 @@ ENV PATH "$PATH:/opt/cmake/bin"
 
 # Install Python
 # RUN apt-get install -y python3.11
+RUN alias python='python3'
 
 # ARM GCC configuration
 ARG arm_archive="13.2.rel1"

From bcd9583133cb480c6f163b5d282ac9302079473f Mon Sep 17 00:00:00 2001
From: Balazs Eszes <c4deszes@gmail.com>
Date: Sun, 28 Jan 2024 10:54:28 +0100
Subject: [PATCH 06/10] Test

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f4ea3e2..b4d220e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,16 +11,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Build image
         run: docker build . -t local
 
       - name: Test Python version
-        run: docker run local python --version
+        run: docker run local /bin/sh -- python --version
 
       - name: Test CMake version
-        run: docker run local cmake --version
+        run: docker run local /bin/sh -- cmake --version
 
       - name: Test ARM compiler version
-        run: docker run local arm-none-eabi-gcc --version
+        run: docker run local /bin/sh -- arm-none-eabi-gcc --version

From f9afce9d10b2fd8d9fe5951fbab2fb9a2fe2ef65 Mon Sep 17 00:00:00 2001
From: Balazs Eszes <c4deszes@gmail.com>
Date: Sun, 28 Jan 2024 11:01:47 +0100
Subject: [PATCH 07/10] Python3?

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b4d220e..9ac515c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
         run: docker build . -t local
 
       - name: Test Python version
-        run: docker run local /bin/sh -- python --version
+        run: docker run local /bin/sh -- python3 --version
 
       - name: Test CMake version
         run: docker run local /bin/sh -- cmake --version

From 268c9b4245d105b38c8d7b2ac3e1dcec6e5be5ce Mon Sep 17 00:00:00 2001
From: Balazs Eszes <c4deszes@gmail.com>
Date: Sun, 28 Jan 2024 11:12:14 +0100
Subject: [PATCH 08/10] Test

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9ac515c..49b0315 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,8 +16,8 @@ jobs:
       - name: Build image
         run: docker build . -t local
 
-      - name: Test Python version
-        run: docker run local /bin/sh -- python3 --version
+      # - name: Test Python version
+      #   run: docker run local /bin/sh -- python3 --version
 
       - name: Test CMake version
         run: docker run local /bin/sh -- cmake --version

From 2f41b211d72a68882fcf3da5b0b6f6fc60036535 Mon Sep 17 00:00:00 2001
From: Balazs Eszes <c4deszes@gmail.com>
Date: Sun, 28 Jan 2024 12:19:22 +0100
Subject: [PATCH 09/10] Fixed?

---
 .github/workflows/build.yml | 9 ---------
 Dockerfile                  | 7 ++++---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 49b0315..cbcccb0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,12 +15,3 @@ jobs:
 
       - name: Build image
         run: docker build . -t local
-
-      # - name: Test Python version
-      #   run: docker run local /bin/sh -- python3 --version
-
-      - name: Test CMake version
-        run: docker run local /bin/sh -- cmake --version
-
-      - name: Test ARM compiler version
-        run: docker run local /bin/sh -- arm-none-eabi-gcc --version
diff --git a/Dockerfile b/Dockerfile
index 4e03464..9f53957 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,14 +21,15 @@ RUN sh cmake-${cmake_version}-${cmake_platform}.sh --prefix=/opt/cmake --skip-li
 ENV PATH "$PATH:/opt/cmake/bin"
 
 # Install Python
-# RUN apt-get install -y python3.11
-RUN alias python='python3'
+RUN apt-get install -y python3.11
+RUN alias python='python3.11'
+RUN alias python3='python3.11'
 
 # ARM GCC configuration
 ARG arm_archive="13.2.rel1"
 ARG arm_version="13.2.rel1"
 ARG arm_folder="13.2.Rel1"
-ARG arm_platform="x86_64-aarch64-none-linux-gnu"
+ARG arm_platform="x86_64-arm-none-eabi"
 
 # Install ARM GCC
 RUN mkdir /opt/armgcc

From b539040cb80054cd1046b50bbdc1ffcc12a7959a Mon Sep 17 00:00:00 2001
From: Balazs Eszes <c4deszes@gmail.com>
Date: Sun, 28 Jan 2024 12:58:40 +0100
Subject: [PATCH 10/10] Alias fix

---
 .github/workflows/release.yml | 6 +++---
 Dockerfile                    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 091ab36..679b98e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -22,7 +22,7 @@ jobs:
         run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
 
       - name: Build container image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           push: true
           tags: |
diff --git a/Dockerfile b/Dockerfile
index 9f53957..7b41a30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,8 +22,8 @@ ENV PATH "$PATH:/opt/cmake/bin"
 
 # Install Python
 RUN apt-get install -y python3.11
-RUN alias python='python3.11'
-RUN alias python3='python3.11'
+RUN echo 'alias python="python3.11"' >> ~/.bashrc
+RUN echo 'alias python3="python3.11"' >> ~/.bashrc
 
 # ARM GCC configuration
 ARG arm_archive="13.2.rel1"