diff options
| author | Kelley Spoon <kelley.spoon@linaro.org> | 2018-02-09 12:04:13 -0600 |
|---|---|---|
| committer | Kelley Spoon <kelley.spoon@linaro.org> | 2018-02-09 12:04:13 -0600 |
| commit | 34494b34ec1817ecb149f653e8e7cec030865310 (patch) | |
| tree | cbc87329d0c84ddec208ad1a990830a590505789 | |
| parent | 57d52b5ea6f21ec85b2cfce35696f974d476a3af (diff) | |
Add in my public key, and swap out deprecated MAINTAINER for LABEL.add_keys
| -rw-r--r-- | Dockerfile_trusty | 4 | ||||
| -rw-r--r-- | Dockerfile_xenial | 4 | ||||
| -rw-r--r-- | pubkeys | 2 |
3 files changed, 6 insertions, 4 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 diff --git a/Dockerfile_xenial b/Dockerfile_xenial index 8205109..d750189 100644 --- a/Dockerfile_xenial +++ b/Dockerfile_xenial @@ -5,7 +5,7 @@ FROM ubuntu:16.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 @@ -0,0 +1,2 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrT7UTB86g3QG3d8M19XusaY9rOyoEL7pn4FTcPgOSBMHg/Tp+V5Zx06sb7KR5dQ6lPnEGBrw6QHkUCuP/tq1xrmsoP830a6ukkloKSdKrbv2Uvxh8ecUy8UF6Rk/htJ0Fug7qlQW+pWza/UUpbpwRWMfE+AIERkq5LO62ImYTpWbCm0CsS3wHDVY9LIQukcu9TLLitFdzK1i20UuOpV0FDRqrVZXHaKRMf1gNQPsVYTfxYr9/fmcU6C8gU3xRjBPgTVIUEkD2lQqHBR37xlV4keF3o7fFf5tpxzXbgUF1rWOYw56vME0PXk+n1MPFvwwdbPv+/3QEMQdfUuVFrAIj ben.copeland@linaro.org +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDcXqIvcwEqDGkATF0/51iu7SBPlql608wqx7hwGdKRSJhFQlDEvmvmgReUQ9B+VF6XOrd3lKGjOd3nRMKeHmO5tdtkeGIqdVanI1J1tLHjF7gkZcM1PygXG7orT6GvKFn7jv2YUfre7UGoCibQR516NHOGI+4vvhb0pzr03tgw6Ej3ZnWVoZxXWHjPMKXXfSi9C6y7nIrfZWMs7C+ldwLGSBcXVvglIpB+VuIXjoOJz8FrIlxdYdxzMpWOH35wRhgIufh6j83fzDPdBN8KXS+VMW8bPsxkY8gxGTZCN22/cQgZAfb8jUCVQqQXwsUxvE1YhEs+EDXbqIx382FRP3oRYzy9LBtOJDXDYn+e/Rg0AzZU5LZBYs7HJqAe33mEBt8Hts8E9i91t7zdv2ZTItlGr/Xt3/r7VJ46hzm0svkbcwpQmbL1rQgzfTOti2vJBNSbwHQ+DA9yAfhhSi1a1fWH51F6kBIzqBM5WmlvBy5ioOzRQbsjMJRdQ9OF2FJQMOwf/Se6OMSlsbzSAF5tiKABa8JJr6/9KdxbBGIOsIzof8YDR4r6C7EzEypCgwwLvuXs3ZNcDUFwJIzJDov44VYFXvR9mrEL2am0ChhsApd7ThZ7mu1FLj5CARsPRGBSbgahsEGb3FQAit7p9aUIq00bANETl/qyey0xU7CaEeJZkw== kelley.spoon@linaro.org |