Skip to content

Commit 0657907

Browse files
author
Matthew Fisher
authored
Merge pull request #151 from bacongobbler/fixup-dockerfile-formatting
fix(Dockerfile): convert tabs to spaces
2 parents 3319bb0 + 0055682 commit 0657907

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

Dockerfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
FROM quay.io/deis/base:v0.3.4
22

33
ENV LANG=en_US.utf8 \
4-
PG_MAJOR=9.4 \
5-
PG_VERSION=9.4.9-1.pgdg80+1 \
6-
PGDATA=/var/lib/postgresql/data
4+
PG_MAJOR=9.4 \
5+
PG_VERSION=9.4.9-1.pgdg80+1 \
6+
PGDATA=/var/lib/postgresql/data
77

88
# Set this separately from those above since it depends on one of them
99
ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin:$PATH
1010

1111
# Add postgres user and group
1212
RUN adduser --system \
13-
--shell /bin/bash \
14-
--disabled-password \
15-
--group \
16-
postgres
13+
--shell /bin/bash \
14+
--disabled-password \
15+
--group \
16+
postgres
1717

1818
RUN buildDeps='gcc git libffi-dev libssl-dev python-dev python-pip python-wheel' && \
1919
localedef -i en_US -c -f UTF-8 -A /etc/locale.alias en_US.UTF-8 && \
2020
export DEBIAN_FRONTEND=noninteractive && \
21-
apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 && \
22-
echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list && \
21+
apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 && \
22+
echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list && \
2323
apt-get update && \
2424
apt-get install -y --no-install-recommends \
2525
$buildDeps \
@@ -34,9 +34,9 @@ RUN buildDeps='gcc git libffi-dev libssl-dev python-dev python-pip python-wheel'
3434
# swift package needs pkg_resources and setuptools
3535
python-pkg-resources \
3636
python-setuptools && \
37-
mkdir -p /run/postgresql && \
38-
chown -R postgres /run/postgresql && \
39-
pip install --disable-pip-version-check --no-cache-dir git+https://github.com/deis/wal-e.git@380821a6c4ea4f98a244680d7c6c5b04b8c694b3 \
37+
mkdir -p /run/postgresql && \
38+
chown -R postgres /run/postgresql && \
39+
pip install --disable-pip-version-check --no-cache-dir git+https://github.com/deis/wal-e.git@380821a6c4ea4f98a244680d7c6c5b04b8c694b3 \
4040
google-gax===0.12.5 \
4141
envdir && \
4242
# cleanup

0 commit comments

Comments
 (0)