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: I9a9d63329bea2b562f297705dc51661896a592f2
This commit is contained in:
Jerome Brette 2018-06-25 22:46:13 -05:00 committed by Jerome Brette
parent 3ef8d03050
commit bfa8c97d3a
7 changed files with 96 additions and 26 deletions

View File

@ -12,25 +12,26 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
DOCKER_REGISTRY ?= quay.io DOCKER_REGISTRY ?= quay.io
REGION_SUFFIX ?= maas-region REGION_SUFFIX ?= maas-region
IMG_COMMON_DIR ?= images IMG_COMMON_DIR ?= images
REGION_IMG_DIR ?= images/maas-region-controller REGION_IMG_DIR ?= images/maas-region-controller
RACK_SUFFIX ?= maas-rack RACK_SUFFIX ?= maas-rack
RACK_IMG_DIR ?= images/maas-rack-controller RACK_IMG_DIR ?= images/maas-rack-controller
CACHE_SUFFIX ?= maas-cache CACHE_SUFFIX ?= maas-cache
CACHE_IMG_DIR ?= images/sstream-cache CACHE_IMG_DIR ?= images/sstream-cache
IMAGE_PREFIX ?= airshipit IMAGE_PREFIX ?= airshipit
IMAGE_TAG ?= untagged IMAGE_TAG ?= untagged
PROXY ?= http://proxy.foo.com:8000 PROXY ?= http://proxy.foo.com:8000
NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
USE_PROXY ?= false USE_PROXY ?= false
PUSH_IMAGE ?= false PUSH_IMAGE ?= false
LABEL ?= commit-id LABEL ?= commit-id
IMAGE_NAME := maas-rack-controller maas-region-controller sstream-cache IMAGE_NAME := maas-rack-controller maas-region-controller sstream-cache
BUILD_DIR := $(shell mktemp -d) BUILD_DIR := $(shell mktemp -d)
HELM := $(BUILD_DIR)/helm HELM := $(BUILD_DIR)/helm
SSTREAM_IMAGE := "https://images.maas.io/ephemeral-v3/daily/" SSTREAM_IMAGE := "https://images.maas.io/ephemeral-v3/daily/"
UBUNTU_BASE_IMAGE ?= ubuntu:16.04
.PHONY: images .PHONY: images
#Build all images in the list #Build all images in the list
@ -66,16 +67,21 @@ helm-install:
.PHONY: build .PHONY: build
build: build:
ifeq ($(USE_PROXY), true) ifeq ($(USE_PROXY), true)
docker build -t $(IMAGE) --network=host --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile --build-arg SSTREAM_IMAGE=$(SSTREAM_IMAGE) \ docker build -t $(IMAGE) --network=host --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile \
--build-arg FROM=$(UBUNTU_BASE_IMAGE) \
--build-arg http_proxy=$(PROXY) \ --build-arg http_proxy=$(PROXY) \
--build-arg https_proxy=$(PROXY) \ --build-arg https_proxy=$(PROXY) \
--build-arg HTTP_PROXY=$(PROXY) \ --build-arg HTTP_PROXY=$(PROXY) \
--build-arg HTTPS_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 NO_PROXY=$(NO_PROXY) \
--build-arg SSTREAM_IMAGE=$(SSTREAM_IMAGE) \
$(IMAGE_DIR) $(IMAGE_DIR)
else else
docker build -t $(IMAGE) --network=host --label $(LABEL) --build-arg SSTREAM_IMAGE=$(SSTREAM_IMAGE) -f $(IMAGE_DIR)/Dockerfile $(IMAGE_DIR) docker build -t $(IMAGE) --network=host --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile \
--build-arg FROM=$(UBUNTU_BASE_IMAGE) \
--build-arg SSTREAM_IMAGE=$(SSTREAM_IMAGE) \
$(IMAGE_DIR)
endif endif
ifeq ($(PUSH_IMAGE), true) ifeq ($(PUSH_IMAGE), true)
docker push $(IMAGE) docker push $(IMAGE)

View File

@ -1,4 +1,5 @@
FROM ubuntu:16.04 ARG FROM=ubuntu:16.04
FROM ${FROM}
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV container docker ENV container docker

View File

@ -1,4 +1,5 @@
FROM ubuntu:16.04 ARG FROM=ubuntu:16.04
FROM ${FROM}
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV container docker ENV container docker

View File

@ -1,4 +1,5 @@
FROM ubuntu:16.04 ARG FROM=ubuntu:16.04
FROM ${FROM}
ARG SSTREAM_IMAGE=https://images.maas.io/ephemeral-v3/daily/ ARG SSTREAM_IMAGE=https://images.maas.io/ephemeral-v3/daily/
ENV IMAGE_SRC ${SSTREAM_IMAGE} ENV IMAGE_SRC ${SSTREAM_IMAGE}

View File

@ -14,6 +14,8 @@
- hosts: primary - hosts: primary
tasks: tasks:
- include_vars: vars.yaml
- name: Debug tag generation inputs - name: Debug tag generation inputs
block: block:
- debug: - debug:
@ -39,16 +41,47 @@
var: image_tags var: image_tags
- name: Install Docker (Debian) - name: Install Docker (Debian)
when: ansible_os_family == 'Debian'
block: 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: - apt:
name: "{{ item }}" name: "{{ item }}"
allow_unauthenticated: True
with_items: with_items:
- docker.io - docker-ce
- python-pip - python-pip
when: ansible_os_family == 'Debian'
- pip: - pip:
name: docker name: docker
version: 2.7.0 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 become: True
- name: Make images - name: Make images

View File

@ -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

View File

@ -0,0 +1,20 @@
# Copyright 2017 The Openstack-Helm Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
docker_daemon:
group: zuul
registry-mirrors:
- "http://{{ zuul_site_mirror_fqdn }}:8082/"
storage-driver: overlay2
debug: True