Skip to content

Commit

Permalink
Install gcompat, clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
csandanov committed Dec 14, 2023
1 parent 5b9b769 commit 8eeef36
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,14 @@ RUN set -ex; \
curl \
freetype \
freetype-dev \
gcompat \
harfbuzz \
make \
nss \
openjdk11-jre \
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"; \
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions tests/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8eeef36

Please sign in to comment.