Skip to content

Commit 595a9ef

Browse files
author
Matthew Fisher
committed
chore(*): rely on etcdctl in deis/base
As of deis/base#4, etcdctl v0.4.2 includes the --no-sync option. We no longer need to install an etcdctl branch just to get this option.
1 parent df1c0ed commit 595a9ef

6 files changed

Lines changed: 0 additions & 24 deletions

File tree

builder/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ RUN echo "%git ALL=(ALL:ALL) NOPASSWD:/home/git/builder" >> /etc/sudoers
4646
RUN wget -q https://s3-us-west-2.amazonaws.com/deis/confd -O /usr/local/bin/confd
4747
RUN chmod +x /usr/local/bin/confd
4848

49-
# install latest etcdctl including no-sync options
50-
RUN wget -q https://s3-us-west-2.amazonaws.com/deis/etcdctl.no-sync -O /usr/local/bin/etcdctl
51-
RUN chmod +x /usr/local/bin/etcdctl
52-
5349
# add the current build context to /app
5450
ADD . /app
5551
RUN chown -R root:root /app

cache/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ RUN add-apt-repository ppa:chris-lea/redis-server -y
77
RUN apt-get update
88
RUN apt-get install -yq redis-server
99

10-
# install latest etcdctl including no-sync options
11-
RUN wget -q https://s3-us-west-2.amazonaws.com/deis/etcdctl.no-sync -O /usr/local/bin/etcdctl
12-
RUN chmod +x /usr/local/bin/etcdctl
13-
1410
# add the current build context to /app
1511
ADD . /app
1612

controller/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ RUN pip install celery==3.1.11 \
3131
# install openssh-client for temporary fleetctl wrapper
3232
RUN apt-get install -yq openssh-client
3333

34-
# install latest etcdctl including no-sync options
35-
RUN wget -q https://s3-us-west-2.amazonaws.com/deis/etcdctl.no-sync -O /usr/local/bin/etcdctl
36-
RUN chmod +x /usr/local/bin/etcdctl
37-
3834
# clone the project into /app
3935
ADD . /app
4036

database/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ RUN wget --quiet --no-check-certificate -O - https://www.postgresql.org/media/ke
88
RUN apt-get update
99
RUN apt-get install -yq postgresql-9.3 && /etc/init.d/postgresql stop
1010

11-
# install latest etcdctl including no-sync options
12-
RUN wget -q https://s3-us-west-2.amazonaws.com/deis/etcdctl.no-sync -O /usr/local/bin/etcdctl
13-
RUN chmod +x /usr/local/bin/etcdctl
14-
1511
# debug to remove
1612
RUN apt-get install -yq curl
1713

registry/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ RUN cd /docker-registry && git checkout 0.6.8
2222
RUN cp /docker-registry/config/boto.cfg /etc/boto.cfg
2323
RUN cd /docker-registry && pip install -r requirements.txt
2424

25-
# install latest etcdctl including no-sync options
26-
RUN wget -q https://s3-us-west-2.amazonaws.com/deis/etcdctl.no-sync -O /usr/local/bin/etcdctl
27-
RUN chmod +x /usr/local/bin/etcdctl
28-
2925
# create data volume
3026
RUN mkdir -p /data/repositories && chown -R registry:registry /data
3127
VOLUME /data

router/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ RUN ./configure --prefix=/var/lib/nginx --sbin-path=/usr/sbin/nginx --conf-path=
1818
RUN make
1919
RUN make install
2020

21-
# install latest etcdctl including no-sync options
22-
RUN wget -q https://s3-us-west-2.amazonaws.com/deis/etcdctl.no-sync -O /usr/local/bin/etcdctl
23-
RUN chmod +x /usr/local/bin/etcdctl
24-
2521
ADD . /app
2622
WORKDIR /app
2723
EXPOSE 80 2222

0 commit comments

Comments
 (0)