From 4727df6b8087a597f4d3124ccdf55caed6919e10 Mon Sep 17 00:00:00 2001 From: Jerome Brette Date: Mon, 25 Jun 2018 22:45:01 -0500 Subject: [PATCH] Update Dockerfile to allow override of FROM variable l is to let user customize the base image of the component by passing FROM=myimage during the build process. This would let any project leveraging Airship ensure that the base image is matching the security requirements for that project and still use the same Dockerfile. This will also ease the control of the /etc/apt/source.list and thereby the result of apt-get update/upgrade procedure. 2. The above goal is achievable by using docker-ce feature such as: ARG FROM="defaultbaseimage:xx" FROM ${FROM} For this reason, the installation of docker.io in the Zuul gating is beeing replaced by docker-ce. 3. Third Goal is to bring consistency with the other compoenents leveraging Helm such as the openstack-helm and potentially use bindep the same way the LOCI images are to ensure 4. The new syntax in the Dockerfile is still commented out until the associated image builder have been updated to use docker-ce as they have been for the LOCI images. Change-Id: I6703589f32487f5668d709f485dae5782b13c002 --- Makefile | 35 ++++++++++-------- images/pegleg/Dockerfile | 3 +- tools/gate/playbooks/docker-image-build.yaml | 37 ++++++++++++++++++- .../gate/playbooks/files/docker-systemd.conf | 8 ++++ tools/gate/playbooks/vars.yaml | 6 ++- 5 files changed, 70 insertions(+), 19 deletions(-) create mode 100644 tools/gate/playbooks/files/docker-systemd.conf diff --git a/Makefile b/Makefile index dd91e7ec..5cb62802 100644 --- a/Makefile +++ b/Makefile @@ -12,18 +12,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -PEGLEG_BUILD_CTX ?= src/bin/pegleg -IMAGE_NAME ?= pegleg -IMAGE_PREFIX ?= attcomdev -DOCKER_REGISTRY ?= quay.io -IMAGE_TAG ?= latest -HELM ?= helm -PROXY ?= http://proxy.foo.com:8000 -NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local -USE_PROXY ?= false -PUSH_IMAGE ?= false -LABEL ?= commit-id -IMAGE ?= $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG) +PEGLEG_BUILD_CTX ?= src/bin/pegleg +IMAGE_NAME ?= pegleg +IMAGE_PREFIX ?= airshipit +DOCKER_REGISTRY ?= quay.io +IMAGE_TAG ?= latest +HELM ?= helm +PROXY ?= http://proxy.foo.com:8000 +NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local +USE_PROXY ?= false +PUSH_IMAGE ?= false +LABEL ?= commit-id +IMAGE ?= $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG) +PYTHON_BASE_IMAGE ?= python:3.6 export # Build all docker images for this project @@ -62,15 +63,19 @@ format: py_format .PHONY: build_pegleg build_pegleg: ifeq ($(USE_PROXY), true) - docker build -t $(IMAGE) --network=host --label $(LABEL) -f images/pegleg/Dockerfile --build-arg ctx_base=$(PEGLEG_BUILD_CTX) \ + docker build -t $(IMAGE) --network=host --label $(LABEL) -f images/pegleg/Dockerfile \ + --build-arg FROM=$(PYTHON_BASE_IMAGE) \ --build-arg http_proxy=$(PROXY) \ --build-arg https_proxy=$(PROXY) \ --build-arg HTTP_PROXY=$(PROXY) \ --build-arg HTTPS_PROXY=$(PROXY) \ --build-arg no_proxy=$(NO_PROXY) \ - --build-arg NO_PROXY=$(NO_PROXY) . + --build-arg NO_PROXY=$(NO_PROXY) \ + --build-arg ctx_base=$(PEGLEG_BUILD_CTX) . else - docker build -t $(IMAGE) --network=host --label $(LABEL) -f images/pegleg/Dockerfile --build-arg ctx_base=$(PEGLEG_BUILD_CTX) . + docker build -t $(IMAGE) --network=host --label $(LABEL) -f images/pegleg/Dockerfile \ + --build-arg FROM=$(PYTHON_BASE_IMAGE) \ + --build-arg ctx_base=$(PEGLEG_BUILD_CTX) . endif ifeq ($(PUSH_IMAGE), true) docker push $(IMAGE) diff --git a/images/pegleg/Dockerfile b/images/pegleg/Dockerfile index 2507a31f..dfa450df 100644 --- a/images/pegleg/Dockerfile +++ b/images/pegleg/Dockerfile @@ -1,4 +1,5 @@ -FROM python:3.6 +ARG FROM=python:3.6 +FROM ${FROM} VOLUME /var/pegleg WORKDIR /var/pegleg diff --git a/tools/gate/playbooks/docker-image-build.yaml b/tools/gate/playbooks/docker-image-build.yaml index 84145e40..23f636cf 100644 --- a/tools/gate/playbooks/docker-image-build.yaml +++ b/tools/gate/playbooks/docker-image-build.yaml @@ -14,6 +14,8 @@ - hosts: primary tasks: + - include_vars: vars.yaml + - name: Debug tag generation inputs block: - debug: @@ -39,16 +41,47 @@ var: image_tags - name: Install Docker (Debian) + when: ansible_os_family == 'Debian' block: + - file: + path: "{{ item }}" + state: directory + with_items: + - /etc/docker/ + - /etc/systemd/system/docker.service.d/ + - /var/lib/docker/ + - mount: + path: /var/lib/docker/ + src: tmpfs + fstype: tmpfs + opts: size=25g + state: mounted + - copy: "{{ item }}" + with_items: + - content: "{{ docker_daemon | to_json }}" + dest: /etc/docker/daemon.json + - src: files/docker-systemd.conf + dest: /etc/systemd/system/docker.service.d/ + - apt_key: + url: https://download.docker.com/linux/ubuntu/gpg + - apt_repository: + repo: deb http://{{ zuul_site_mirror_fqdn }}/deb-docker xenial stable - apt: name: "{{ item }}" + allow_unauthenticated: True with_items: - - docker.io + - docker-ce - python-pip - when: ansible_os_family == 'Debian' - pip: name: docker version: 2.7.0 + # NOTE(SamYaple): Allow all connections from containers to host so the + # containers can access the http server for git and wheels + - iptables: + action: insert + chain: INPUT + in_interface: docker0 + jump: ACCEPT become: True - name: Make images diff --git a/tools/gate/playbooks/files/docker-systemd.conf b/tools/gate/playbooks/files/docker-systemd.conf new file mode 100644 index 00000000..6b01af0f --- /dev/null +++ b/tools/gate/playbooks/files/docker-systemd.conf @@ -0,0 +1,8 @@ +# NOTE(SamYaple): CentOS cannot be build with userns-remap enabled. httpd uses +# cap_set_file capability and there is no way to pass that in at build as of +# docker 17.06. +# TODO(SamYaple): Periodically check to see if this is possible in newer +# versions of Docker +[Service] +ExecStart= +ExecStart=/usr/bin/dockerd diff --git a/tools/gate/playbooks/vars.yaml b/tools/gate/playbooks/vars.yaml index eb6ffae1..c89b7980 100644 --- a/tools/gate/playbooks/vars.yaml +++ b/tools/gate/playbooks/vars.yaml @@ -12,4 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -null: null +docker_daemon: + group: zuul + registry-mirrors: + - "http://{{ zuul_site_mirror_fqdn }}:8082/" + storage-driver: overlay2