From b9918d9c77834d85bbd5322af85d34fa7098748f Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Thu, 5 May 2022 11:48:52 +0200 Subject: [PATCH 1/4] git lfs --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..2fc6cee49 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +*.apk filter=lfs diff=lfs merge=lfs -text +*.aar filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text \ No newline at end of file From 13c5c5549a9bb8df02589dcabb39dbf9cdf81af5 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Mon, 27 Jun 2022 08:46:28 +0200 Subject: [PATCH 2/4] Update pip --- conan/docker/aac-ubuntu-bionic/Dockerfile | 2 ++ conan/docker/aac-ubuntu-focal/Dockerfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/conan/docker/aac-ubuntu-bionic/Dockerfile b/conan/docker/aac-ubuntu-bionic/Dockerfile index b59094b93..596038564 100644 --- a/conan/docker/aac-ubuntu-bionic/Dockerfile +++ b/conan/docker/aac-ubuntu-bionic/Dockerfile @@ -18,6 +18,8 @@ RUN apt update && \ RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 1 && \ update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 2 +RUN pip3 install -U pip + RUN pip3 install conan RUN useradd -l --uid 1000 --create-home conan diff --git a/conan/docker/aac-ubuntu-focal/Dockerfile b/conan/docker/aac-ubuntu-focal/Dockerfile index 9bfad4863..c7dcd9702 100644 --- a/conan/docker/aac-ubuntu-focal/Dockerfile +++ b/conan/docker/aac-ubuntu-focal/Dockerfile @@ -8,6 +8,8 @@ RUN apt update && \ gstreamer1.0-libav gstreamer1.0-doc gstreamer1.0-tools gstreamer1.0-x gstreamer1.0-alsa gstreamer1.0-gl \ gstreamer1.0-gtk3 gstreamer1.0-qt5 gstreamer1.0-pulseaudio +RUN pip install -U pip + RUN pip install conan RUN useradd -l --uid 1000 --create-home conan From 7045c9666ea6455fcbef9ae36be089e8495e65be Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Mon, 27 Jun 2022 08:46:29 +0200 Subject: [PATCH 3/4] Install git-lfs global --- conan/docker/aac-ubuntu-bionic/Dockerfile | 4 +++- conan/docker/aac-ubuntu-focal/Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/conan/docker/aac-ubuntu-bionic/Dockerfile b/conan/docker/aac-ubuntu-bionic/Dockerfile index 596038564..ec128af85 100644 --- a/conan/docker/aac-ubuntu-bionic/Dockerfile +++ b/conan/docker/aac-ubuntu-bionic/Dockerfile @@ -13,7 +13,9 @@ RUN apt update && \ libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-bad1.0-dev \ gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ gstreamer1.0-libav gstreamer1.0-doc gstreamer1.0-tools gstreamer1.0-x gstreamer1.0-alsa gstreamer1.0-gl \ - gstreamer1.0-gtk3 gstreamer1.0-qt5 gstreamer1.0-pulseaudio + gstreamer1.0-gtk3 gstreamer1.0-qt5 gstreamer1.0-pulseaudio git-lfs + +RUN git lfs install --system --skip-repo RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 1 && \ update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 2 diff --git a/conan/docker/aac-ubuntu-focal/Dockerfile b/conan/docker/aac-ubuntu-focal/Dockerfile index c7dcd9702..41f14c7a2 100644 --- a/conan/docker/aac-ubuntu-focal/Dockerfile +++ b/conan/docker/aac-ubuntu-focal/Dockerfile @@ -6,7 +6,9 @@ RUN apt update && \ libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-bad1.0-dev \ gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ gstreamer1.0-libav gstreamer1.0-doc gstreamer1.0-tools gstreamer1.0-x gstreamer1.0-alsa gstreamer1.0-gl \ - gstreamer1.0-gtk3 gstreamer1.0-qt5 gstreamer1.0-pulseaudio + gstreamer1.0-gtk3 gstreamer1.0-qt5 gstreamer1.0-pulseaudio git-lfs + +RUN git lfs install --system --skip-repo RUN pip install -U pip From 7502fa736a35385ef72e7ae871f3d82dbd38a6a7 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Thu, 30 Jun 2022 11:12:07 +0200 Subject: [PATCH 4/4] Install Java 11 --- conan/docker/aac-ubuntu-bionic/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conan/docker/aac-ubuntu-bionic/Dockerfile b/conan/docker/aac-ubuntu-bionic/Dockerfile index ec128af85..9d7bb8f2b 100644 --- a/conan/docker/aac-ubuntu-bionic/Dockerfile +++ b/conan/docker/aac-ubuntu-bionic/Dockerfile @@ -9,7 +9,7 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul RUN apt update && \ DEBIAN_FRONTEND=noninteractive apt install -y \ - cmake git-core python python3 python3.7 python3-pip unzip emacs-nox mingw-w64 \ + openjdk-11-jdk cmake git-core python python3 python3.7 python3-pip unzip emacs-nox mingw-w64 \ libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-bad1.0-dev \ gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ gstreamer1.0-libav gstreamer1.0-doc gstreamer1.0-tools gstreamer1.0-x gstreamer1.0-alsa gstreamer1.0-gl \