Skip to content

Commit

Permalink
move back to alpine linux as default base image
Browse files Browse the repository at this point in the history
  • Loading branch information
megastef committed Mar 20, 2016
1 parent 7530f67 commit 22a0dfe
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 49 deletions.
34 changes: 11 additions & 23 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,34 +1,22 @@
FROM node:4.3.0-slim
FROM alpine:3.3

RUN apt-get update && apt-get install -y \
curl \
# Remove obsolete files:
&& apt-get clean \
&& rm -rf \
/tmp/* \
/usr/share/doc/* \
/var/cache/* \
/var/lib/apt/lists/* \
/var/tmp/*

RUN curl -L \
https://github.com/krallin/tini/releases/download/v0.9.0/tini \
> /usr/local/bin/tini && chmod 755 /usr/local/bin/tini
RUN apk --no-cache add \
tini \
nodejs \
procps \
curl \
coreutils

COPY . /usr/src/app
WORKDIR /usr/src/app

RUN apt-get update && apt-get install -y git \
RUN apk --no-cache add --virtual deps git \
&& npm install -g \
&& apt-get remove --auto-remove -y git \
# Remove obsolete files:
&& apt-get clean \
&& apk del deps \
# Clean up obsolete files:
&& rm -rf \
/tmp/* \
/usr/share/doc/* \
/var/cache/* \
/var/lib/apt/lists/* \
/var/tmp/*
/root/.npm

RUN ln -s /usr/src/app/run.sh /usr/local/bin/run-sematext-agent

Expand Down
26 changes: 0 additions & 26 deletions Dockerfile.alpine

This file was deleted.

38 changes: 38 additions & 0 deletions Dockerfile.deb
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
FROM node:4.3.0-slim

RUN apt-get update && apt-get install -y \
curl \
# Remove obsolete files:
&& apt-get clean \
&& rm -rf \
/tmp/* \
/usr/share/doc/* \
/var/cache/* \
/var/lib/apt/lists/* \
/var/tmp/*

RUN curl -L \
https://github.com/krallin/tini/releases/download/v0.9.0/tini \
> /usr/local/bin/tini && chmod 755 /usr/local/bin/tini

COPY . /usr/src/app
WORKDIR /usr/src/app

RUN apt-get update && apt-get install -y git \
&& npm install -g \
&& apt-get remove --auto-remove -y git \
# Remove obsolete files:
&& apt-get clean \
&& rm -rf \
/tmp/* \
/usr/share/doc/* \
/var/cache/* \
/var/lib/apt/lists/* \
/var/tmp/*

RUN ln -s /usr/src/app/run.sh /usr/local/bin/run-sematext-agent

EXPOSE 9000

ENTRYPOINT ["tini", "--"]
CMD ["run-sematext-agent"]

0 comments on commit 22a0dfe

Please sign in to comment.