Skip to content

Commit

Permalink
Add jq to Ubuntu Base Image (#168)
Browse files Browse the repository at this point in the history
* add jq to the base image

* empty commit
  • Loading branch information
trudeaua21 authored Apr 15, 2022
1 parent 9c81258 commit 573058f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
1 change: 1 addition & 0 deletions images/ubuntu/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ RUN apt-get -q update \
curl \
git \
git-lfs \
jq \
openssh-client \
wget \
&& git lfs install --system --skip-repo \
Expand Down
8 changes: 0 additions & 8 deletions images/ubuntu/editor/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,6 @@ RUN echo "$version-$module" | grep -q -v '^\(2018.3\|2018.4\).*android' \
RUN echo "$version-$module" | grep -q -vP '^20(?!18).*android' \
&& exit 0 \
|| : \
# Install jq
&& apt-get update -qq \
&& apt-get install -qq -y --no-install-recommends jq \
\
# Environment Variables
&& export RAW_ANDROID_SDK_ROOT=$(jq -cr '(.[] | select(.id == "android-sdk-platform-tools")).destination' $UNITY_PATH/modules.json) \
# We need to replace some characters common to paths that will break the sed expression when expanded
Expand All @@ -168,10 +164,6 @@ RUN echo "$version-$module" | grep -q -vP '^20(?!18).*android' \
&& export JAVA_HOME=${ESCAPED_JAVA_HOME:-$UNITY_PATH/Editor/Data/PlaybackEngines/AndroidPlayer/Tools/OpenJDK/Linux} \
&& export PATH=$JAVA_HOME/bin:${ANDROID_SDK_ROOT}/tools:${ANDROID_SDK_ROOT}/tools/bin:${ANDROID_SDK_ROOT}/platform-tools:${PATH} \
\
# Clean up
&& apt-get remove -y jq \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
# Accept licenses
&& yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --licenses \
\
Expand Down

0 comments on commit 573058f

Please sign in to comment.