Skip to content

Commit 573058f

Browse files
authored
Add jq to Ubuntu Base Image (#168)
* add jq to the base image * empty commit
1 parent 9c81258 commit 573058f

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

images/ubuntu/base/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ RUN apt-get -q update \
4141
curl \
4242
git \
4343
git-lfs \
44+
jq \
4445
openssh-client \
4546
wget \
4647
&& git lfs install --system --skip-repo \

images/ubuntu/editor/Dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,6 @@ RUN echo "$version-$module" | grep -q -v '^\(2018.3\|2018.4\).*android' \
150150
RUN echo "$version-$module" | grep -q -vP '^20(?!18).*android' \
151151
&& exit 0 \
152152
|| : \
153-
# Install jq
154-
&& apt-get update -qq \
155-
&& apt-get install -qq -y --no-install-recommends jq \
156-
\
157153
# Environment Variables
158154
&& export RAW_ANDROID_SDK_ROOT=$(jq -cr '(.[] | select(.id == "android-sdk-platform-tools")).destination' $UNITY_PATH/modules.json) \
159155
# We need to replace some characters common to paths that will break the sed expression when expanded
@@ -168,10 +164,6 @@ RUN echo "$version-$module" | grep -q -vP '^20(?!18).*android' \
168164
&& export JAVA_HOME=${ESCAPED_JAVA_HOME:-$UNITY_PATH/Editor/Data/PlaybackEngines/AndroidPlayer/Tools/OpenJDK/Linux} \
169165
&& export PATH=$JAVA_HOME/bin:${ANDROID_SDK_ROOT}/tools:${ANDROID_SDK_ROOT}/tools/bin:${ANDROID_SDK_ROOT}/platform-tools:${PATH} \
170166
\
171-
# Clean up
172-
&& apt-get remove -y jq \
173-
&& apt-get clean \
174-
&& rm -rf /var/lib/apt/lists/* \
175167
# Accept licenses
176168
&& yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --licenses \
177169
\

0 commit comments

Comments
 (0)