Skip to content

Commit 9c08a32

Browse files
committed
chore(Dockerfile): Refactor image to use ubuntu-slim
1 parent 9531c15 commit 9c08a32

3 files changed

Lines changed: 37 additions & 71 deletions

File tree

rootfs/Dockerfile

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,40 @@
1-
FROM alpine:3.3
2-
3-
# install common packages
4-
RUN apk add --update-cache curl bash openssl sudo && rm -rf /var/cache/apk/*
1+
FROM quay.io/deis/base:0.2.0
2+
3+
RUN adduser --system \
4+
--shell /bin/bash \
5+
--disabled-password \
6+
--home /app \
7+
--group \
8+
deis
9+
10+
COPY . /app
11+
12+
RUN apt-get update \
13+
&& apt-get install -y \
14+
gcc \
15+
git \
16+
libffi-dev \
17+
libpq5 \
18+
libpq-dev \
19+
python3 \
20+
python3-dev \
21+
sudo \
22+
&& ln -s /usr/bin/python3 /usr/bin/python \
23+
&& curl -sSL https://bootstrap.pypa.io/get-pip.py | python - pip==8.1.1 \
24+
&& mkdir -p /configs && chown -R deis:deis /configs \
25+
&& pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \
26+
&& apt-get remove -y --auto-remove --purge \
27+
gcc \
28+
git \
29+
libffi-dev \
30+
libpq-dev \
31+
python3-dev \
32+
&& apt-get clean \
33+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man /usr/share/doc
534

635
# define execution environment
36+
WORKDIR /app
737
CMD ["/app/bin/boot"]
838
EXPOSE 8000
939

10-
# define work environment
11-
WORKDIR /app
12-
13-
ADD build.sh /app/tmp/build.sh
14-
15-
ADD requirements.txt /app/requirements.txt
16-
17-
RUN DOCKER_BUILD=true /app/tmp/build.sh && rm -rf /app/*
18-
19-
ADD . /app
20-
21-
ENV WORKFLOW_RELEASE 2.0.0-dev
40+
ENV WORKFLOW_RELEASE 2.0.0

rootfs/bin/boot

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@ mkdir -p /app/data/logs
1717
chmod -R 777 /app/data/logs
1818

1919
# allow deis user group permission to Docker socket
20-
if addgroup -g "$(stat -c "%g" /var/run/docker.sock)" docker; then
21-
addgroup deis docker
22-
else
23-
addgroup deis "$(stat -c "%G" /var/run/docker.sock)"
24-
fi
20+
groupadd -g "$(stat -c "%g" /var/run/docker.sock)" docker || true
21+
usermod -a -G docker deis || true
2522

2623
echo "Django checks:"
2724
python /app/manage.py check --deploy api

rootfs/build.sh

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)