Skip to content

Commit

Permalink
Merge pull request #27 from BuddhiWathsala/master
Browse files Browse the repository at this point in the history
Add minimal OS base images and remove zip file from images
  • Loading branch information
pcnfernando authored Nov 8, 2019
2 parents a309770 + e1fdf32 commit b091ed6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions docker-files/siddhi-runner/alpine/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ------------------------------------------------------------------------

# set base Docker image to AdoptOpenJDK Alpine Docker image
FROM adoptopenjdk/openjdk8:jdk8u212-b03-alpine
FROM adoptopenjdk/openjdk8:jdk8u212-b03-alpine-slim
MAINTAINER Siddhi IO Docker Maintainers "[email protected]"

# set user configurations
Expand Down Expand Up @@ -61,8 +61,8 @@ COPY --chown=siddhi_user:siddhi_io ${FILES}/${PACK}/ ${USER_HOME}/
RUN if [ ! -e ${USER_HOME}/${RUNTIME_SERVER}*.zip ] ; then wget --no-check-certificate -O ${USER_HOME}/${RUNTIME_SERVER_PACK}.zip "https://github.com/siddhi-io/distribution/releases/download/v${RUNTIME_SERVER_VERSION}/${RUNTIME_SERVER_PACK}.zip" \
; else echo "Using Local image "; fi

RUN unzip -d ${USER_HOME} ${USER_HOME}/${RUNTIME_SERVER}*.zip && for file in ${USER_HOME}/${RUNTIME_SERVER}*; do mv $file ${USER_HOME}/${RUNTIME_SERVER}; done \
&& chown ${USER}:${USER_GROUP} -R ${RUNTIME_SERVER_HOME} && rm -f {USER_HOME}/${RUNTIME_SERVER_PACK}.zip
RUN unzip -d ${USER_HOME} ${USER_HOME}/${RUNTIME_SERVER}*.zip && rm -f ${USER_HOME}/${RUNTIME_SERVER}*.zip && for file in ${USER_HOME}/${RUNTIME_SERVER}*; do mv $file ${USER_HOME}/${RUNTIME_SERVER}; done \
&& chown ${USER}:${USER_GROUP} -R ${RUNTIME_SERVER_HOME}

# set the user and work directory
USER ${USER_ID}
Expand Down
6 changes: 3 additions & 3 deletions docker-files/siddhi-runner/ubuntu/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ------------------------------------------------------------------------

# set base Docker image to AdoptOpenJDK Ubuntu Docker image
FROM adoptopenjdk/openjdk8:jdk8u192-b12
FROM adoptopenjdk/openjdk8:jdk8u192-b12-slim
MAINTAINER Siddhi IO Docker Maintainers "[email protected]"

# set user configurations
Expand Down Expand Up @@ -66,8 +66,8 @@ COPY --chown=siddhi_user:siddhi_io ${FILES}/${PACK}/ ${USER_HOME}/
RUN if [ ! -e ${USER_HOME}/${RUNTIME_SERVER}*.zip ] ; then wget --no-check-certificate -O ${USER_HOME}/${RUNTIME_SERVER_PACK}.zip "https://github.com/siddhi-io/distribution/releases/download/v${RUNTIME_SERVER_VERSION}/${RUNTIME_SERVER_PACK}.zip" \
; else echo "Using Local image "; fi

RUN unzip -d ${USER_HOME} ${USER_HOME}/${RUNTIME_SERVER}*.zip && for file in ${USER_HOME}/${RUNTIME_SERVER}*; do mv $file ${USER_HOME}/${RUNTIME_SERVER}; done \
&& chown ${USER}:${USER_GROUP} -R ${RUNTIME_SERVER_HOME} && rm -f {USER_HOME}/${RUNTIME_SERVER_PACK}.zip
RUN unzip -d ${USER_HOME} ${USER_HOME}/${RUNTIME_SERVER}*.zip && rm -f ${USER_HOME}/${RUNTIME_SERVER}*.zip && for file in ${USER_HOME}/${RUNTIME_SERVER}*; do mv $file ${USER_HOME}/${RUNTIME_SERVER}; done \
&& chown ${USER}:${USER_GROUP} -R ${RUNTIME_SERVER_HOME}

# set the user and work directory
USER ${USER_ID}
Expand Down
6 changes: 3 additions & 3 deletions docker-files/siddhi-tooling/ubuntu/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ------------------------------------------------------------------------

# set base Docker image to AdoptOpenJDK Ubuntu Docker image
FROM adoptopenjdk/openjdk8:jdk8u192-b12
FROM adoptopenjdk/openjdk8:jdk8u192-b12-slim
MAINTAINER Siddhi IO Docker Maintainers "[email protected]"

# set user configurations
Expand Down Expand Up @@ -78,8 +78,8 @@ COPY --chown=siddhi_user:siddhi_io ${FILES}/${PACK}/ ${USER_HOME}/
RUN if [ ! -e ${USER_HOME}/${RUNTIME_SERVER}*.zip ] ; then wget --no-check-certificate -O ${USER_HOME}/${RUNTIME_SERVER_PACK}.zip "https://github.com/siddhi-io/distribution/releases/download/v${RUNTIME_SERVER_VERSION}/${RUNTIME_SERVER_PACK}.zip" \
; else echo "Using Local image "; fi

RUN unzip -d ${USER_HOME} ${USER_HOME}/${RUNTIME_SERVER}*.zip && for file in ${USER_HOME}/${RUNTIME_SERVER}*; do mv $file ${USER_HOME}/${RUNTIME_SERVER}; done \
&& chown ${USER}:${USER_GROUP} -R ${RUNTIME_SERVER_HOME} && rm -f {USER_HOME}/${RUNTIME_SERVER_PACK}.zip
RUN unzip -d ${USER_HOME} ${USER_HOME}/${RUNTIME_SERVER}*.zip && rm -f ${USER_HOME}/${RUNTIME_SERVER}*.zip && for file in ${USER_HOME}/${RUNTIME_SERVER}*; do mv $file ${USER_HOME}/${RUNTIME_SERVER}; done \
&& chown ${USER}:${USER_GROUP} -R ${RUNTIME_SERVER_HOME}

# set the user and work directory
USER ${USER_ID}
Expand Down

0 comments on commit b091ed6

Please sign in to comment.