summaryrefslogtreecommitdiff
path: root/Dockerfile_trusty
diff options
context:
space:
mode:
authorKelley Spoon <kelley.spoon@linaro.org>2018-02-09 12:04:13 -0600
committerKelley Spoon <kelley.spoon@linaro.org>2018-02-09 12:04:13 -0600
commit34494b34ec1817ecb149f653e8e7cec030865310 (patch)
treecbc87329d0c84ddec208ad1a990830a590505789 /Dockerfile_trusty
parent57d52b5ea6f21ec85b2cfce35696f974d476a3af (diff)
Add in my public key, and swap out deprecated MAINTAINER for LABEL.add_keys
Diffstat (limited to 'Dockerfile_trusty')
-rw-r--r--Dockerfile_trusty4
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile_trusty b/Dockerfile_trusty
index 2269c66..445ea98 100644
--- a/Dockerfile_trusty
+++ b/Dockerfile_trusty
@@ -5,7 +5,7 @@
FROM ubuntu:14.04
-MAINTAINER Ben Copeland <ben.copeland@linaro.org>
+LABEL maintainer="Ben Copeland <ben.copeland@linaro.org>"
RUN apt-get update
@@ -16,7 +16,7 @@ RUN apt-get update
RUN apt-get update && apt-get install -y ansible vim bash openssh-server python-apt sudo cron
RUN mkdir -p /root/.ssh/
-RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrT7UTB86g3QG3d8M19XusaY9rOyoEL7pn4FTcPgOSBMHg/Tp+V5Zx06sb7KR5dQ6lPnEGBrw6QHkUCuP/tq1xrmsoP830a6ukkloKSdKrbv2Uvxh8ecUy8UF6Rk/htJ0Fug7qlQW+pWza/UUpbpwRWMfE+AIERkq5LO62ImYTpWbCm0CsS3wHDVY9LIQukcu9TLLitFdzK1i20UuOpV0FDRqrVZXHaKRMf1gNQPsVYTfxYr9/fmcU6C8gU3xRjBPgTVIUEkD2lQqHBR37xlV4keF3o7fFf5tpxzXbgUF1rWOYw56vME0PXk+n1MPFvwwdbPv+/3QEMQdfUuVFrAIj ben.copeland@linaro.org" >> /root/.ssh/authorized_keys
+ADD pubkeys /root/.ssh/authorized_keys
# add playbooks/roles to the image.
#ADD ldap.conf /etc/ldap.conf