Revert "osbs-master: set atomic-reactor buildroot access to docker registry"

This reverts commit 95c19484bb.
This commit is contained in:
Adam Miller 2016-04-18 14:55:27 +00:00
parent c399cd7ba3
commit ca6c4dafe1
2 changed files with 2 additions and 21 deletions

View file

@ -3,8 +3,5 @@ RUN dnf -y install docker git python-docker-py python-setuptools e2fsprogs koji
ADD ./atomic-reactor.tar.gz /tmp/
RUN cd /tmp/atomic-reactor-*/ && python setup.py install
ADD ./ca.crt /etc/pki/ca-trust/source/anchors/osbs-dev.ca.crt
RUN mkdir -p /etc/docker/certs.d/{{docker_registry}}
ADD ./client.key /etc/docker/certs.d/{{docker_registry}}/client.key
ADD ./client.cert /etc/docker/certs.d/{{docker_registry}}/client.cert
RUN update-ca-trust
CMD ["atomic-reactor", "--verbose", "inside-build"]

View file

@ -278,25 +278,9 @@
path: "/etc/osbs/buildroot/"
state: directory
- name: install docker client cert for buildroot to auth to registry
copy:
src: "{{private}}/files/koji/containerbuild.cert.pem"
dest: "/etc/osbs/buildroot/client.cert"
mode: 0400
notify:
- buildroot container
- name: install docker client key for buildroot to auth to registry
copy:
src: "{{private}}/files/koji/containerbuild.key.pem"
dest: "/etc/osbs/buildroot/client.key"
mode: 0400
notify:
- buildroot container
- name: Upload Dockerfile for buildroot container
template:
src: "{{ files }}/osbs/buildroot-Dockerfile.j2"
copy:
src: "{{ files }}/osbs/buildroot-Dockerfile"
dest: "/etc/osbs/buildroot/Dockerfile"
mode: 0400
notify: