revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

[Docker] Install tzdata in buildkite-linux.

Browse source 
For libc++ there is a work-in-progress implementation of the C++20
chrono timezone database. The Clang CI test libc++ and fails for the
tests of this new feature.

Updated both buildkite and buildbot images
This commit is contained in:
Mikhail Goncharov 2023-09-11 18:37:33 +02:00
parent 157418a00d
commit b4ecac5576
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
containers/buildbot-linux/Dockerfile
View file

@ -1,5 +1,8 @@
FROM ubuntu:latest FROM ubuntu:latest
# Make sure apt-get doesn't try to prompt for stuff like our time zone, etc.
ENV DEBIAN_FRONTEND=noninteractive
RUN echo 'intall packages'; \ RUN echo 'intall packages'; \
apt-get update; \ apt-get update; \
apt-get upgrade; \ apt-get upgrade; \
@ -15,6 +18,8 @@ RUN echo 'intall packages'; \
python3 python3-psutil python3-pip python3-setuptools \ python3 python3-psutil python3-pip python3-setuptools \
lsb-release software-properties-common \ lsb-release software-properties-common \
swig python3-dev libedit-dev libncurses5-dev libxml2-dev liblzma-dev golang rsync jq \ swig python3-dev libedit-dev libncurses5-dev libxml2-dev liblzma-dev golang rsync jq \
# for libc++ tests that use the timezone database of the chrono header
tzdata \
# for llvm installation script # for llvm installation script
sudo \ sudo \
# build scripts # build scripts
@ -66,18 +71,19 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
COPY *.sh /usr/local/bin/
RUN chmod og+rx /usr/local/bin/*.sh
RUN pip3 install buildbot-worker==2.8.4 RUN pip3 install buildbot-worker==2.8.4
VOLUME /build VOLUME /build
# WORKDIR /build
RUN groupadd -g 121 runner \ RUN groupadd -g 121 runner \
&& useradd -mr -d /home/runner -u 1001 -g 121 runner \ && useradd -mr -d /home/runner -u 1001 -g 121 runner \
&& mkdir -p /build \ && mkdir -p /build \
&& chown -R runner:runner /build; && chown -R runner:runner /build;
COPY *.sh /usr/local/bin/
RUN chmod og+rx /usr/local/bin/*.sh
ENTRYPOINT ["entrypoint.sh"] ENTRYPOINT ["entrypoint.sh"]
CMD ["gosu", "runner", "sleep", "infinity"] CMD ["gosu", "runner", "sleep", "infinity"]

15
containers/buildkite-linux/Dockerfile
View file

@ -1,11 +1,14 @@
FROM ubuntu:latest FROM ubuntu:latest
# Make sure apt-get doesn't try to prompt for stuff like our time zone, etc.
ENV DEBIAN_FRONTEND=noninteractive
RUN echo 'intall packages'; \ RUN echo 'intall packages'; \
apt-get update; \ apt-get update; \
apt-get upgrade; \ apt-get upgrade; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gosu \ gosu tini \
locales openssh-client gnupg ca-certificates \ locales openssh-client gnupg ca-certificates apt-transport-https \
zip wget curl git \ zip wget curl git \
gdb build-essential \ gdb build-essential \
ninja-build \ ninja-build \
@ -15,6 +18,8 @@ RUN echo 'intall packages'; \
python3 python3-psutil python3-pip python3-setuptools \ python3 python3-psutil python3-pip python3-setuptools \
lsb-release software-properties-common \ lsb-release software-properties-common \
swig python3-dev libedit-dev libncurses5-dev libxml2-dev liblzma-dev golang rsync jq \ swig python3-dev libedit-dev libncurses5-dev libxml2-dev liblzma-dev golang rsync jq \
# for libc++ tests that use the timezone database of the chrono header
tzdata \
# for llvm installation script # for llvm installation script
sudo \ sudo \
# build scripts # build scripts
@ -66,6 +71,8 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
COPY *.sh /usr/local/bin/
RUN chmod og+rx /usr/local/bin/*.sh
RUN echo 'install buildkite' ;\ RUN echo 'install buildkite' ;\
apt-get install -y apt-transport-https gnupg;\ apt-get install -y apt-transport-https gnupg;\
@ -75,10 +82,8 @@ RUN echo 'install buildkite' ;\
apt-get install -y buildkite-agent tini gosu; \ apt-get install -y buildkite-agent tini gosu; \
apt-get clean; apt-get clean;
COPY *.sh /usr/local/bin/
RUN chmod og+rx /usr/local/bin/*.sh
COPY --chown=buildkite-agent:buildkite-agent pre-checkout /etc/buildkite-agent/hooks COPY --chown=buildkite-agent:buildkite-agent pre-checkout /etc/buildkite-agent/hooks
# COPY --chown=buildkite-agent:buildkite-agent post-checkout /etc/buildkite-agent/hooks
# buildkite working directory # buildkite working directory
VOLUME /var/lib/buildkite-agent VOLUME /var/lib/buildkite-agent