Skip to content

Commit ab70163

Browse files
committed
ref(logger): use ubuntu:14.04 as Dockerfile base image
1 parent 6704bbd commit ab70163

2 files changed

Lines changed: 21 additions & 15 deletions

File tree

logger/Dockerfile

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
1-
FROM deis/base:latest
2-
MAINTAINER OpDemand <info@opdemand.com>
1+
FROM ubuntu:14.04
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
# install common packages
6+
RUN apt-get update && apt-get install -y curl
7+
8+
# install etcdctl
9+
RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
10+
&& chmod +x /usr/local/bin/etcdctl
11+
12+
# install confd
13+
RUN curl -sSL -o /usr/local/bin/confd https://s3-us-west-2.amazonaws.com/opdemand/confd-v0.5.0-json \
14+
&& chmod +x /usr/local/bin/confd
315

416
# install go runtime
5-
RUN wget -qO- https://storage.googleapis.com/golang/go1.3.1.linux-amd64.tar.gz | tar -C /usr/local -xz
17+
RUN curl -sSL https://storage.googleapis.com/golang/go1.3.1.linux-amd64.tar.gz | tar -C /usr/local -xz
618

719
# prepare go environment
820
RUN mkdir -p /go

logger/README.md

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,16 @@
22

33
A system logger for use in the [Deis](http://deis.io) open source PaaS.
44

5-
[![image](https://d207aa93qlcgug.cloudfront.net/img/icons/framed-icon-checked-repository.svg)](https://index.docker.io/u/deis/logger/)
5+
This Docker image is based on the official
6+
[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
67

7-
[**Trusted Build**](https://index.docker.io/u/deis/logger/)
8-
9-
This Docker image is based on the trusted build
10-
[deis/base](https://index.docker.io/u/deis/base/), which itself is based
11-
on the official [ubuntu:12.04](https://index.docker.io/_/ubuntu/) image.
12-
13-
Please add any issues you find with this software to the
14-
[Deis project](https://github.com/deis/deis/issues).
8+
Please add any [issues](https://github.com/deis/deis/issues) you find with this software to
9+
the [Deis Project](https://github.com/deis/deis).
1510

1611
## Usage
1712

18-
* `make build` builds the *deis/logger* image inside a vagrant VM
19-
* `make run` installs and starts *deis/logger*, then displays log
20-
output from the container
13+
Please consult the [Makefile](Makefile) for current instructions on how to build, test, push,
14+
install, and start **deis/logger**.
2115

2216
## Environment Variables
2317

0 commit comments

Comments
 (0)