Skip to content

Commit 278badf

Browse files
committed
Tweaks to dockerfiles
1 parent a226066 commit 278badf

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

rails-app-base/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ ENV DEBIAN_FRONTEND noninteractive
1616
WORKDIR /tmp
1717

1818
# Install base packages.
19-
RUN \
20-
apt-get update && \
21-
apt-get -y install \
19+
RUN apt-get update
20+
RUN apt-get -y install \
2221
build-essential \
2322
curl \
2423
git-core \
@@ -57,7 +56,7 @@ RUN \
5756
CXX="g++ -Wno-unused-local-typedefs" make && \
5857
CXX="g++ -Wno-unused-local-typedefs" make install && \
5958
cd .. && \
60-
rm -rf ./node-v*
59+
rm -rf node-v*
6160

6261
# Compile ruby from source.
6362
RUN \
@@ -69,7 +68,7 @@ RUN \
6968
make && \
7069
make install && \
7170
cd .. && \
72-
rm -rf ./ruby-*
71+
rm -rf ruby-*
7372

7473
# Install ruby gems.
7574
RUN gem install bundler rubygems-update --no-ri --no-rdoc

redis-commander/Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,23 @@ MAINTAINER Marc Lennox <[email protected]>
1313
ENV DEBIAN_FRONTEND noninteractive
1414

1515
# Install packages.
16-
RUN \
17-
apt-get update && \
18-
apt-get install -y python python-dev python-pip python-virtualenv wget
16+
RUN apt-get update
17+
RUN apt-get install -y python python-dev python-pip python-virtualenv wget
18+
19+
# Define working directory.
20+
WORKDIR /tmp
1921

2022
# Compile node from source.
2123
RUN \
22-
cd /tmp && \
2324
wget http://nodejs.org/dist/node-latest.tar.gz && \
2425
tar xvzf node-*.tar.gz && \
2526
rm -f node-*.tar.gz && \
2627
cd node-* && \
2728
./configure && \
2829
CXX="g++ -Wno-unused-local-typedefs" make && \
2930
CXX="g++ -Wno-unused-local-typedefs" make install && \
30-
cd /tmp && \
31-
rm -rf /tmp/node-v*
31+
cd .. && \
32+
rm -rf node-v*
3233

3334
# Install node packages.
3435
RUN npm install -g redis-commander

0 commit comments

Comments
 (0)