From 8eeef362fd9d553d1d88c1fc5f02c93b546773d4 Mon Sep 17 00:00:00 2001 From: Chingis Sandanov Date: Thu, 14 Dec 2023 17:23:20 +0300 Subject: [PATCH] Install gcompat, clean up --- Dockerfile | 3 +-- Makefile | 1 + README.md | 3 +-- tests/run.sh | 4 ---- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index da7af37..39fbe3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,6 +35,7 @@ RUN set -ex; \ curl \ freetype \ freetype-dev \ + gcompat \ harfbuzz \ make \ nss \ @@ -42,8 +43,6 @@ RUN set -ex; \ sed \ ttf-freefont; \ \ - apk add -U --no-cache -t .kibana-edge-run-deps -X http://dl-cdn.alpinelinux.org/alpine/edge/main libc6-compat; \ - \ apk add --no-cache -t .kibana-build-deps gnupg openssl tar; \ \ gotpl_url="https://github.com/wodby/gotpl/releases/download/0.1.5/gotpl-alpine-linux-amd64-0.1.5.tar.gz"; \ diff --git a/Makefile b/Makefile index 623a0a0..644bb0e 100644 --- a/Makefile +++ b/Makefile @@ -53,5 +53,6 @@ logs: clean: -docker rm -f $(NAME) + -IMAGE=$(REPO):$(TAG) ES_VER=$(KIBANA_VER_MINOR) docker-compose -f tests/docker-compose.yml down -v release: build push diff --git a/README.md b/README.md index 37fbb3b..c21c276 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,10 @@ [![Build Status](https://github.com/wodby/kibana/workflows/Build%20docker%20image/badge.svg)](https://github.com/wodby/kibana/actions) [![Docker Pulls](https://img.shields.io/docker/pulls/wodby/kibana.svg)](https://hub.docker.com/r/wodby/kibana) [![Docker Stars](https://img.shields.io/docker/stars/wodby/kibana.svg)](https://hub.docker.com/r/wodby/kibana) -[![Docker Layers](https://images.microbadger.com/badges/image/wodby/kibana.svg)](https://microbadger.com/images/wodby/kibana) ## Docker Images -❗For better reliability we release images with stability tags (`wodby/kibana:6-X.X.X`) which correspond to [git tags](https://github.com/wodby/kibana/releases). We strongly recommend using images only with stability tags. +❗For better reliability we release images with stability tags (`wodby/kibana:7-X.X.X`) which correspond to [git tags](https://github.com/wodby/kibana/releases). We strongly recommend using images only with stability tags. - All images based on Alpine Linux - Base image: [node](https://hub.docker.com/_/node) diff --git a/tests/run.sh b/tests/run.sh index 2269c13..4d1700a 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -6,10 +6,6 @@ if [[ -n "${DEBUG}" ]]; then set -x fi -if [[ -n "${TRAVIS}" ]]; then - sudo sysctl -w vm.max_map_count=262144 -fi - docker-compose up -d docker-compose exec -T elasticsearch make check-ready wait_seconds=5 max_try=30 -f /usr/local/bin/actions.mk docker-compose exec -T kibana make check-ready wait_seconds=5 max_try=30 -f /usr/local/bin/actions.mk