From 897da46596e697bf20ef9d7b58199bdaacd3f99b Mon Sep 17 00:00:00 2001
From: usimd <11619247+usimd@users.noreply.github.com>
Date: Thu, 3 Jun 2021 17:18:02 +0200
Subject: [PATCH 1/2] Update compiler and reduce final image size

---
 Dockerfile | 6 ++++--
 README.md  | 2 +-
 build.sh   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a6a45a5..7450ee6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,15 @@
 FROM ubuntu:20.04
 
 ARG MPLABX_VERSION=5.45
-ARG XC8_VERSION=1.34
+ARG XC8_VERSION=2.20
 
 # Install the dependencies
 # See https://microchipdeveloper.com/install:mplabx-lin64
 RUN dpkg --add-architecture i386 && \
   apt-get update && \
   apt-get install -y libc6:i386 libx11-6:i386 libxext6:i386 libstdc++6:i386 libexpat1:i386 wget sudo make && \
+  apt-get clean && \
+  apt-get autoremove && \
   rm -rf /var/lib/apt/lists/*
 
 # Download and install XC8
@@ -22,7 +24,7 @@ RUN wget -nv -O /tmp/mplabx "https://ww1.microchip.com/downloads/en/DeviceDoc/MP
   tar -xf mplabx && \
   rm mplabx && \
   mv "MPLABX-v${MPLABX_VERSION}-linux-installer.sh" mplabx && \
-  sudo ./mplabx --nox11 -- --unattendedmodeui none --mode unattended --ipe 0 --collectInfo 0 --installdir /opt/mplabx && \
+  sudo ./mplabx --nox11 -- --unattendedmodeui none --mode unattended --ipe 0 --collectInfo 0 --installdir /opt/mplabx --16bitmcu 0 --32bitmcu 0 --othermcu 0 && \
   rm mplabx
 
 COPY build.sh /build.sh
diff --git a/README.md b/README.md
index 4c022d4..652fa9c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ This action will build a MPLAB X / XC8 project.
 It runs on Linux Ubuntu 20.04 and uses:
 
 * [MPLAB X](https://www.microchip.com/en-us/development-tools-tools-and-software/mplab-x-ide) v5.45
-* [XC8](https://www.microchip.com/en-us/development-tools-tools-and-software/mplab-xc-compilers) v1.34
+* [XC8](https://www.microchip.com/en-us/development-tools-tools-and-software/mplab-xc-compilers) v2.20
 
 ## Inputs
 
diff --git a/build.sh b/build.sh
index 58f5034..8cc5d18 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "Building project $1:$2 with MPLAB X v5.45 and XC8 v1.34"
+echo "Building project $1:$2 with MPLAB X v5.45 and XC8 v2.20"
 
 set -x -e
 

From ffabc3e37254f937d9dfb2c24f0cfbd41be99181 Mon Sep 17 00:00:00 2001
From: usimd <11619247+usimd@users.noreply.github.com>
Date: Mon, 7 Jun 2021 19:46:21 +0200
Subject: [PATCH 2/2] Keep XC8 at v1.34

Co-authored-by: Alexis Jeandeau <alexis.jeandeau@gmail.com>
---
 Dockerfile | 2 +-
 README.md  | 2 +-
 build.sh   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7450ee6..c32cc31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:20.04
 
 ARG MPLABX_VERSION=5.45
-ARG XC8_VERSION=2.20
+ARG XC8_VERSION=1.34
 
 # Install the dependencies
 # See https://microchipdeveloper.com/install:mplabx-lin64
diff --git a/README.md b/README.md
index 652fa9c..4c022d4 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ This action will build a MPLAB X / XC8 project.
 It runs on Linux Ubuntu 20.04 and uses:
 
 * [MPLAB X](https://www.microchip.com/en-us/development-tools-tools-and-software/mplab-x-ide) v5.45
-* [XC8](https://www.microchip.com/en-us/development-tools-tools-and-software/mplab-xc-compilers) v2.20
+* [XC8](https://www.microchip.com/en-us/development-tools-tools-and-software/mplab-xc-compilers) v1.34
 
 ## Inputs
 
diff --git a/build.sh b/build.sh
index 8cc5d18..58f5034 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "Building project $1:$2 with MPLAB X v5.45 and XC8 v2.20"
+echo "Building project $1:$2 with MPLAB X v5.45 and XC8 v1.34"
 
 set -x -e