Skip to content

Removed unneeded OpenJDK install from docker images and updated Elastisearch to 7.17.8 #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed unneeded OpenJDK install from docker images and updated Elastisearch to 7.17.8 #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions docker_containers/mindmeld_dep_docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
# Pull base image.
FROM ubuntu:18.04

ENV ES_PKG_NAME elasticsearch-7.8.0-linux-x86_64
ENV ES_FOLDER_NAME elasticsearch-7.8.0
ENV ES_PKG_NAME elasticsearch-7.17.8-linux-x86_64
ENV ES_FOLDER_NAME elasticsearch-7.17.8

# System packages
RUN apt-get update && \
apt-get -y install software-properties-common curl vim
apt-get -y install software-properties-common curl vim wget

# Create directories
RUN mkdir /root/.pip /root/.mindmeld /data
Expand All @@ -24,19 +24,10 @@ RUN mkdir /root/.pip /root/.mindmeld /data
RUN apt-get -y install python-pip python3-pip python-dev build-essential && \
apt-get -y install software-properties-common

# Install Java
RUN apt update
RUN apt-get update
RUN apt-get install -y wget
RUN apt install openjdk-8-jdk -y

# Install duckling dependency
RUN apt-get -y update && \
DEBIAN_FRONTEND="noninteractive" apt-get -y upgrade tzdata

# set JAVA_HOME
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64

# Install Elasticsearch.
RUN \
cd / && \
Expand All @@ -49,7 +40,6 @@ RUN useradd -ms /bin/bash mindmeld
RUN mkdir /elasticsearch/log
RUN chown -R mindmeld:mindmeld /elasticsearch /data /var/log


# Add Config Files
COPY ./conf/elasticsearch.yml /elasticsearch/config/elasticsearch.yml

Expand Down
16 changes: 3 additions & 13 deletions docker_containers/mindmeld_docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
# Pull base image.
FROM ubuntu:18.04

ENV ES_PKG_NAME elasticsearch-7.8.0-linux-x86_64
ENV ES_FOLDER_NAME elasticsearch-7.8.0
ENV ES_PKG_NAME elasticsearch-7.17.8-linux-x86_64
ENV ES_FOLDER_NAME elasticsearch-7.17.8

# System packages
RUN apt-get update && \
apt-get -y install software-properties-common curl vim
apt-get -y install software-properties-common curl vim wget

# Create directories
RUN mkdir /root/.pip /root/.mindmeld /data
Expand All @@ -24,19 +24,10 @@ RUN mkdir /root/.pip /root/.mindmeld /data
RUN apt-get -y install python-pip python3-pip python-dev build-essential && \
apt-get -y install software-properties-common

# Install Java
RUN apt update
RUN apt-get update
RUN apt-get install -y wget
RUN apt install openjdk-8-jdk -y

# Install duckling dependency
RUN apt-get -y update && \
DEBIAN_FRONTEND="noninteractive" apt-get -y upgrade tzdata

# set JAVA_HOME
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64

# Install Elasticsearch.
RUN \
cd / && \
Expand All @@ -49,7 +40,6 @@ RUN useradd -ms /bin/bash mindmeld
RUN mkdir /elasticsearch/log
RUN chown -R mindmeld:mindmeld /elasticsearch /data /var/log


# Add Config Files
COPY ./conf/elasticsearch.yml /elasticsearch/config/elasticsearch.yml

Expand Down