From afb9a898c92259fa71fe4421d99e5327bd4d0287 Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Tue, 11 Aug 2020 15:34:51 -0500 Subject: [PATCH 1/6] [docker] include noto-cjk --- .../docker_generator/templates/dockerfile.template.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts b/src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts index ea2f881768c8fe..6c2bb3240be58f 100755 --- a/src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts +++ b/src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts @@ -79,6 +79,12 @@ function generator({ # Add Reporting dependencies. RUN ${packageManager()} update -y && ${packageManager()} install -y fontconfig freetype shadow-utils && ${packageManager()} clean all + + RUN cd /usr/local/share/fonts/ \ + && curl-L -o "https://github.com/googlefonts/noto-cjk/raw/NotoSansV2.001/NotoSansCJK-Regular.ttc" \ + && fc-cache -f -v + && cd - + # Add an init process, check the checksum to make sure it's a match RUN curl -L -o /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64 RUN echo "37f2c1f0372a45554f1b89924fbb134fc24c3756efaedf11e07f599494e0eff9 /usr/local/bin/dumb-init" | sha256sum -c - From 911b8652329f97a8a0d2a929c860052a3b75d7db Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Tue, 11 Aug 2020 15:57:22 -0500 Subject: [PATCH 2/6] tmp build docker - revert me before merging --- test/scripts/jenkins_xpack_build_kibana.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/jenkins_xpack_build_kibana.sh b/test/scripts/jenkins_xpack_build_kibana.sh index 2452e2f5b8c58c..3e7946055094bc 100755 --- a/test/scripts/jenkins_xpack_build_kibana.sh +++ b/test/scripts/jenkins_xpack_build_kibana.sh @@ -28,7 +28,7 @@ node scripts/functional_tests --assert-none-excluded \ if [[ -z "$CODE_COVERAGE" ]] ; then echo " -> building and extracting default Kibana distributable for use in functional tests" cd "$KIBANA_DIR" - node scripts/build --debug --no-oss + node scripts/build --debug --no-oss --all-platforms linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')" installDir="$KIBANA_DIR/install/kibana" mkdir -p "$installDir" From 21e2f4c7554dee1e811b061b369494ce2d78c7bc Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Mon, 17 Aug 2020 10:35:29 -0500 Subject: [PATCH 3/6] Revert "tmp build docker - revert me before merging" This reverts commit 911b8652329f97a8a0d2a929c860052a3b75d7db. --- test/scripts/jenkins_xpack_build_kibana.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/jenkins_xpack_build_kibana.sh b/test/scripts/jenkins_xpack_build_kibana.sh index 3e7946055094bc..2452e2f5b8c58c 100755 --- a/test/scripts/jenkins_xpack_build_kibana.sh +++ b/test/scripts/jenkins_xpack_build_kibana.sh @@ -28,7 +28,7 @@ node scripts/functional_tests --assert-none-excluded \ if [[ -z "$CODE_COVERAGE" ]] ; then echo " -> building and extracting default Kibana distributable for use in functional tests" cd "$KIBANA_DIR" - node scripts/build --debug --no-oss --all-platforms + node scripts/build --debug --no-oss linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')" installDir="$KIBANA_DIR/install/kibana" mkdir -p "$installDir" From 0c70a45c7dcc92288d3d69907e088388087cd775 Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Mon, 24 Aug 2020 16:36:10 -0500 Subject: [PATCH 4/6] use common fonts to avoid ambiguity between which --- .../os_packages/docker_generator/templates/Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile b/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile index 784e1c83f4c48e..1ad3cc772df7bd 100644 --- a/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile +++ b/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile @@ -47,7 +47,7 @@ EXPOSE 5601 RUN for iter in {1..10}; do \ {{packageManager}} update --setopt=tsflags=nodocs -y && \ {{packageManager}} install --setopt=tsflags=nodocs -y \ - fontconfig freetype shadow-utils libnss3.so {{#ubi}}findutils{{/ubi}} && \ + fontconfig freetype google-noto-fonts-core google-noto-cjk-fonts shadow-utils libnss3.so {{#ubi}}findutils{{/ubi}} && \ {{packageManager}} clean all && exit_code=0 && break || exit_code=$? && echo "{{packageManager}} error: retry $iter in 10s" && \ sleep 10; \ done; \ @@ -58,11 +58,6 @@ RUN curl -L -o /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releas RUN echo "37f2c1f0372a45554f1b89924fbb134fc24c3756efaedf11e07f599494e0eff9 /usr/local/bin/dumb-init" | sha256sum -c - RUN chmod +x /usr/local/bin/dumb-init -RUN cd /usr/local/share/fonts/ \ -&& curl-L -o "https://github.com/googlefonts/noto-cjk/raw/NotoSansV2.001/NotoSansCJK-Regular.ttc" \ -&& fc-cache -f -v \ -&& cd - - # Bring in Kibana from the initial stage. COPY --from=builder --chown=1000:0 /usr/share/kibana /usr/share/kibana WORKDIR /usr/share/kibana From 813b5817593417cf02d66f9d916660eaef2b330a Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Wed, 2 Sep 2020 16:24:16 -0500 Subject: [PATCH 5/6] Revert "use common fonts to avoid ambiguity between which" This reverts commit 0c70a45c7dcc92288d3d69907e088388087cd775. --- .../os_packages/docker_generator/templates/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile b/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile index 1ad3cc772df7bd..784e1c83f4c48e 100644 --- a/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile +++ b/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile @@ -47,7 +47,7 @@ EXPOSE 5601 RUN for iter in {1..10}; do \ {{packageManager}} update --setopt=tsflags=nodocs -y && \ {{packageManager}} install --setopt=tsflags=nodocs -y \ - fontconfig freetype google-noto-fonts-core google-noto-cjk-fonts shadow-utils libnss3.so {{#ubi}}findutils{{/ubi}} && \ + fontconfig freetype shadow-utils libnss3.so {{#ubi}}findutils{{/ubi}} && \ {{packageManager}} clean all && exit_code=0 && break || exit_code=$? && echo "{{packageManager}} error: retry $iter in 10s" && \ sleep 10; \ done; \ @@ -58,6 +58,11 @@ RUN curl -L -o /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releas RUN echo "37f2c1f0372a45554f1b89924fbb134fc24c3756efaedf11e07f599494e0eff9 /usr/local/bin/dumb-init" | sha256sum -c - RUN chmod +x /usr/local/bin/dumb-init +RUN cd /usr/local/share/fonts/ \ +&& curl-L -o "https://github.com/googlefonts/noto-cjk/raw/NotoSansV2.001/NotoSansCJK-Regular.ttc" \ +&& fc-cache -f -v \ +&& cd - + # Bring in Kibana from the initial stage. COPY --from=builder --chown=1000:0 /usr/share/kibana /usr/share/kibana WORKDIR /usr/share/kibana From e795c9b713ed09d32b13859c091a4d2d08260815 Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Mon, 5 Oct 2020 14:36:58 -0500 Subject: [PATCH 6/6] fix font paths --- .../os_packages/docker_generator/templates/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile b/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile index 2c0275eeb4e491..e7523c1bf60326 100644 --- a/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile +++ b/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile @@ -58,10 +58,10 @@ RUN curl -L -o /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releas RUN echo "37f2c1f0372a45554f1b89924fbb134fc24c3756efaedf11e07f599494e0eff9 /usr/local/bin/dumb-init" | sha256sum -c - RUN chmod +x /usr/local/bin/dumb-init -RUN cd /usr/local/share/fonts/ \ -&& curl-L -o "https://github.com/googlefonts/noto-cjk/raw/NotoSansV2.001/NotoSansCJK-Regular.ttc" \ -&& fc-cache -f -v \ -&& cd - +RUN mkdir /usr/share/fonts/local +RUN curl -L -o /usr/share/fonts/local/NotoSansCJK-Regular.ttc https://github.com/googlefonts/noto-cjk/raw/NotoSansV2.001/NotoSansCJK-Regular.ttc +RUN echo "5dcd1c336cc9344cb77c03a0cd8982ca8a7dc97d620fd6c9c434e02dcb1ceeb3 /usr/share/fonts/local/NotoSansCJK-Regular.ttc" | sha256sum -c - +RUN fc-cache -v # Bring in Kibana from the initial stage. COPY --from=builder --chown=1000:0 /usr/share/kibana /usr/share/kibana