Skip to content

Commit

Permalink
Merge branch 'master' into curations-creation
Browse files Browse the repository at this point in the history
  • Loading branch information
cee-chen committed Feb 25, 2021
2 parents 732ee56 + 6c96fbb commit 3e5b31b
Show file tree
Hide file tree
Showing 483 changed files with 14,672 additions and 6,142 deletions.
2 changes: 1 addition & 1 deletion .ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts

ARG NODE_VERSION=14.15.4
ARG NODE_VERSION=14.16.0

FROM node:${NODE_VERSION} AS base

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.aws-config.json
.signing-config.json
/api_docs
.ackrc
/.es
/.chromium
Expand Down
Loading

0 comments on commit 3e5b31b

Please sign in to comment.