Skip to content

Commit 964ffc5

Browse files
author
Matthew Fisher
committed
ref(Dockerfile): move Dockerfile to root
This allows deis/postgres to be deployed to Workflow through `git push deis master`.
1 parent b793b68 commit 964ffc5

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

rootfs/Dockerfile renamed to Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364
5353
&& apt-get clean \
5454
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man /usr/share/doc
5555

56-
COPY . /
56+
COPY rootfs /
5757
ENV WALE_ENVDIR=/etc/wal-e.d/env
5858
RUN mkdir -p $WALE_ENVDIR
5959

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ all: docker-build docker-push
2222
# For cases where we're building from local
2323
# We also alter the RC file to set the image name.
2424
docker-build:
25-
docker build --rm -t ${IMAGE} rootfs
25+
docker build --rm -t ${IMAGE} .
2626
docker tag ${IMAGE} ${MUTABLE_IMAGE}
2727

2828
test: test-style test-unit test-functional

0 commit comments

Comments
 (0)