Skip to content

Commit

Permalink
Merge pull request #12992 from keymanapp/chore/linux/docker
Browse files Browse the repository at this point in the history
chore(linux): docker build: update package index before installing packages in Dockerfiles
  • Loading branch information
ermshiperete authored Jan 23, 2025
2 parents 006bcc0 + 606e6af commit 4280481
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions resources/docker-images/android/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ RUN <<EOF
PKG_SDKMANAGER=sdkmanager
DIR_SDK=/opt/android-sdk
fi
apt-get update
apt-get -q -y install gradle maven pandoc $PKG_SDKMANAGER jq openjdk-${JAVA_VERSION}-jdk
sdkmanager platform-tools
yes | sdkmanager --licenses
Expand Down
4 changes: 2 additions & 2 deletions resources/docker-images/core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ LABEL org.opencontainers.image.url="https://github.com/keymanapp/keyman.git"
LABEL org.opencontainers.image.title="Keyman Core Build Image"

USER root
RUN apt-get install -qy git jq llvm meson pkgconf \
xvfb xserver-xephyr metacity
RUN apt-get update && \
apt-get install -qy git jq llvm meson pkgconf xvfb xserver-xephyr metacity

# Pre-install emscripten
USER build
Expand Down
3 changes: 2 additions & 1 deletion resources/docker-images/linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ LABEL org.opencontainers.image.title="Keyman Linux Build Image"
# Install dependencies
ADD control /tmp/control
# Answer 'yes' to install questions
RUN apt-get install -qy python3 python3-setuptools python3-coverage \
RUN apt-get update && \
apt-get install -qy python3 python3-setuptools python3-coverage \
devscripts equivs libdatetime-perl lcov gcovr xvfb \
xserver-xephyr metacity mutter dbus-x11 weston xwayland && \
(yes | mk-build-deps --install /tmp/control) || true && \
Expand Down
3 changes: 2 additions & 1 deletion resources/docker-images/web/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ LABEL org.opencontainers.image.url="https://github.com/keymanapp/keyman.git"
LABEL org.opencontainers.image.title="Keyman for Web Build Image"

USER root
RUN apt-get install -qy git jq xvfb xserver-xephyr metacity
RUN apt-get update && \
apt-get install -qy git jq xvfb xserver-xephyr metacity
# For playwright:
RUN apt-get install -qy libevent-2.1-7t64 libxslt1.1 libwoff1 libvpx9 \
libgstreamer-plugins-bad1.0-0 libwebpdemux2 libharfbuzz-icu0 \
Expand Down

0 comments on commit 4280481

Please sign in to comment.