Skip to content

Commit

Permalink
praecoapp/elastalert-server:20230625
Browse files Browse the repository at this point in the history
  • Loading branch information
nsano-rururu committed Jun 24, 2023
1 parent 086c60a commit 7595a9b
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.19.0
16.20.1
17 changes: 17 additions & 0 deletions DockerImageLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# praecoapp/elastalert-server:20230625

## New features

None

## Bug Fix

None

## Other changes

- jertel/elastalert2:2.11.0 to 2.12.0
- node:16.19.0-alpine3.17 to node:16.20.1-alpine3.18
- python:3.11-alpine3.17 to python:3.11-alpine3.18
- Library Update

# praecoapp/elastalert-server:20230430

## New features
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM python:3.11-alpine3.17 as ea2
ARG ELASTALERT_VERSION=2.11.0
FROM python:3.11-alpine3.18 as ea2
ARG ELASTALERT_VERSION=2.12.0
ENV ELASTALERT_VERSION=${ELASTALERT_VERSION}
ARG ELASTALERT_URL=https://github.com/jertel/elastalert2/archive/refs/tags/$ELASTALERT_VERSION.zip
ENV ELASTALERT_URL=${ELASTALERT_URL}
Expand All @@ -13,7 +13,7 @@ RUN apk add --update --no-cache wget && \
rm elastalert.zip && \
mv e* "${ELASTALERT_HOME}"

FROM node:16.19-alpine3.17 as install
FROM node:16.20.1-alpine3.18 as install
ENV PATH /home/node/.local/bin:$PATH

RUN apk add --update --no-cache \
Expand Down Expand Up @@ -49,7 +49,7 @@ WORKDIR /opt/elastalert
RUN pip3 install --no-cache-dir cryptography --user
RUN pip3 install --no-cache-dir -r requirements.txt --user

FROM node:16.19-alpine3.17
FROM node:16.20.1-alpine3.18
LABEL maintainer="John Susek <[email protected]>"
ENV TZ Etc/UTC
ENV PATH /home/node/.local/bin:$PATH
Expand All @@ -71,7 +71,7 @@ RUN apk add --update --no-cache \
tzdata

COPY --from=install /opt/elastalert /opt/elastalert
COPY --from=install /home/node/.local/lib/python3.10/site-packages /home/node/.local/lib/python3.10/site-packages
COPY --from=install /home/node/.local/lib/python3.11/site-packages /home/node/.local/lib/python3.11/site-packages

WORKDIR /opt/elastalert-server

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
v ?= 2.11.0
v ?= 2.12.0

all: build

build:
docker pull python:3.11-alpine3.17 && docker pull node:16.19-alpine3.17
docker pull python:3.11-alpine3.18 && docker pull node:16.20.1-alpine3.18
docker build --build-arg ELASTALERT_VERSION=$(v) -t praecoapp/elastalert-server .

server: build
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"test": "./test"
},
"dependencies": {
"@babel/cli": "^7.21.0",
"@babel/core": "^7.21.5",
"@babel/preset-env": "^7.21.5",
"@babel/register": "^7.21.0",
"@babel/cli": "^7.22.5",
"@babel/core": "^7.22.5",
"@babel/preset-env": "^7.22.5",
"@babel/register": "^7.22.5",
"@opensearch-project/opensearch": "^2.2.1",
"axios": "^1.4.0",
"bunyan": "^1.8.15",
Expand All @@ -30,21 +30,21 @@
"es5": "npm:@elastic/elasticsearch@^5.6.22",
"es6": "npm:@elastic/elasticsearch@^6.8.8",
"es7": "npm:@elastic/elasticsearch@^7.17.0",
"es8": "npm:@elastic/elasticsearch@^8.7.0",
"es8": "npm:@elastic/elasticsearch@^8.8.1",
"express": "^4.18.2",
"fs-extra": "^11.1.1",
"joi": "^17.9.2",
"js-yaml": "^4.1.0",
"lodash": "^4.17.21",
"mkdirp": "^3.0.1",
"object-resolve-path": "^1.1.1",
"randomstring": "^1.2.3",
"randomstring": "^1.3.0",
"readdirp": "^3.6.0",
"recursive-readdir": "^2.2.3",
"ws": "^8.13.0"
},
"devDependencies": {
"eslint": "^8.39.0"
"eslint": "^8.43.0"
},
"scripts": {
"build": "babel src -d lib",
Expand Down

0 comments on commit 7595a9b

Please sign in to comment.