diff --git a/Dockerfile b/Dockerfile index 85776a9..a42b820 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,13 +8,15 @@ RUN apt-get -qq update && \ apt-get install -yq curl libmagic-dev wget logrotate # Set arguments -ARG ARKIME_VERSION=5.1.2 +ARG ARKIME_VERSION=5.2.0 ARG ARKIME_DEB_PACKAGE="arkime_${ARKIME_VERSION}-1.ubuntu2204_amd64.deb" # Set environment variables ENV ARKIME_VERSION $ARKIME_VERSION ENV OS_HOST "opensearch" ENV OS_PORT "9200" +ENV OS_USER "" +ENV OS_PASSWORD "" ENV ARKIME_INTERFACE "eth0" ENV ARKIME_ADMIN_PASSWORD "admin" ENV ARKIME_HOSTNAME "localhost" diff --git a/scripts/startarkime.sh b/scripts/startarkime.sh index a0a9230..a64c305 100755 --- a/scripts/startarkime.sh +++ b/scripts/startarkime.sh @@ -16,7 +16,13 @@ export ARKIME_ELASTICSEARCH="http://"$OS_HOST":"$OS_PORT export ARKIME_INET=no if [ ! -f $ARKIMEDIR/etc/.initialized ]; then - echo -e "$ARKIME_LOCALELASTICSEARCH\n$ARKIME_INET" | $ARKIMEDIR/bin/Configure + if [ -z $OS_USER ]; then + # pass empty OS user to Configure script + echo -e "$ARKIME_LOCALELASTICSEARCH\n\n$ARKIME_INET" | $ARKIMEDIR/bin/Configure + else + # pass OS user and password to Configure + echo -e "$ARKIME_LOCALELASTICSEARCH\n$OS_USER\n$OS_PASSWORD\n$ARKIME_INET" | $ARKIMEDIR/bin/Configure + fi echo INIT | $ARKIMEDIR/db/db.pl http://$OS_HOST:$OS_PORT init $ARKIMEDIR/bin/arkime_add_user.sh admin "Admin User" $ARKIME_ADMIN_PASSWORD --admin echo $ARKIME_VERSION > $ARKIMEDIR/etc/.initialized