Skip to content

Commit 3659efb

Browse files
authored
fix(Dockerfile): missing && in Dockerfile makes apt not so happy (#5)
1 parent 21c376d commit 3659efb

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dev:
2525
# For cases where we're building from local
2626
# We also alter the RC file to set the image name.
2727
docker-build:
28-
docker build --rm -t ${IMAGE} rootfs
28+
docker build --no-cache --rm -t ${IMAGE} rootfs
2929
docker tag ${IMAGE} ${MUTABLE_IMAGE}
3030

3131
test: test-style test-unit test-functional

rootfs/Dockerfile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ FROM quay.io/deis/base:v0.3.4
22

33
COPY . /
44

5-
RUN apt-get update \
6-
apt-get install -y --no-install-recommends redis-server && \
7-
chown -R redis:redis /etc/redis /var/lib/redis /var/log/redis && \
5+
RUN apt-get update && \
6+
apt-get install -y --no-install-recommends redis-server && \
87
# cleanup
98
apt-get clean -y && \
109
# package up license files if any by appending to existing tar
@@ -16,14 +15,11 @@ RUN apt-get update \
1615
/usr/share/info \
1716
/usr/share/locale \
1817
/var/lib/apt/lists/* \
19-
/var/log/* \
2018
/var/cache/debconf/* \
21-
/etc/systemd \
22-
/lib/lsb \
23-
/lib/udev \
2419
/usr/lib/x86_64-linux-gnu/gconv/IBM* \
2520
/usr/lib/x86_64-linux-gnu/gconv/EBC* && \
26-
bash -c "mkdir -p /usr/share/man/man{1..8}"
21+
bash -c "mkdir -p /usr/share/man/man{1..8}" && \
22+
chown -R redis:redis /etc/redis /var/lib/redis /var/log/redis
2723

2824
USER redis
2925
WORKDIR /var/lib/redis

0 commit comments

Comments
 (0)