Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI prepare build Docker images #23

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

CI prepare build Docker images #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9918d9
git lfs
hannesa2 May 5, 2022
13c5c55
Update pip
hannesa2 Jun 27, 2022
7045c96
Install git-lfs global
hannesa2 Jun 27, 2022
7502fa7
Install Java 11
hannesa2 Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 6 additions & 2 deletions conan/docker/aac-ubuntu-bionic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@ 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 \
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

RUN pip3 install -U pip

RUN pip3 install conan

RUN useradd -l --uid 1000 --create-home conan
Expand Down
6 changes: 5 additions & 1 deletion conan/docker/aac-ubuntu-focal/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ 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

RUN pip install conan

Expand Down