Add focal base to dockerfiles

Change-Id: I2e57506e94d468e8c342814dad740b8a450aa23d
This commit is contained in:
Sam Morrison 2020-11-25 10:04:07 +11:00 committed by Gage Hugo
parent 57a75eba72
commit 8baeb8ecea
5 changed files with 51 additions and 0 deletions

View File

@ -0,0 +1,23 @@
ARG FROM=ubuntu:focal
FROM ${FROM}
ARG UBUNTU_URL=http://archive.ubuntu.com/ubuntu/
ARG CLOUD_ARCHIVE_URL=http://ubuntu-cloud.archive.canonical.com/ubuntu/
ARG CEPH_URL=http://download.ceph.com/debian-octopus/
ARG ALLOW_UNAUTHENTICATED=false
ARG PIP_INDEX_URL=https://pypi.python.org/simple/
ARG PIP_TRUSTED_HOST=pypi.python.org
ENV PIP_INDEX_URL=${PIP_INDEX_URL}
ENV PIP_TRUSTED_HOST=${PIP_TRUSTED_HOST}
COPY sources.list /etc/apt/
COPY cloud-archive.gpg ceph.gpg /etc/apt/trusted.gpg.d/
RUN sed -i \
-e "s|%%UBUNTU_URL%%|${UBUNTU_URL}|g" \
-e "s|%%CLOUD_ARCHIVE_URL%%|${CLOUD_ARCHIVE_URL}|g" \
-e "s|%%CEPH_URL%%|${CEPH_URL}|g" \
/etc/apt/sources.list
RUN echo "APT::Get::AllowUnauthenticated \"${ALLOW_UNAUTHENTICATED}\";\n\
Acquire::AllowInsecureRepositories \"${ALLOW_UNAUTHENTICATED}\";\n\
Acquire::AllowDowngradeToInsecureRepositories \"${ALLOW_UNAUTHENTICATED}\";" \
>> /etc/apt/apt.conf.d/allow-unathenticated

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,6 @@
deb %%UBUNTU_URL%% focal main universe
deb %%UBUNTU_URL%% focal-updates main universe
deb %%UBUNTU_URL%% focal-backports main universe
deb %%UBUNTU_URL%% focal-security main universe
deb %%CEPH_URL%% focal main
deb %%CLOUD_ARCHIVE_URL%% focal-updates/victoria main

View File

@ -38,6 +38,28 @@ distros:
PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
FROM: base:centos
PYTHON3: yes
- name: ubuntu_focal
image: ubuntu:focal
release: master
buildargs:
base:
UBUNTU_URL: http://{{ zuul_site_mirror_fqdn }}/ubuntu/
CLOUD_ARCHIVE_URL: http://{{ zuul_site_mirror_fqdn }}/ubuntu-cloud-archive/
CEPH_URL: http://{{ zuul_site_mirror_fqdn }}/ceph-deb-octopus/
ALLOW_UNAUTHENTICATED: "true"
PIP_INDEX_URL: http://{{ zuul_site_mirror_fqdn }}/pypi/simple
PIP_TRUSTED_HOST: "{{ zuul_site_mirror_fqdn }}"
project:
PROJECT: "{{ project }}"
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
WHEELS: 172.17.0.1:5000/loci/requirements:master-ubuntu_focal
FROM: base:ubuntu_focal
PYTHON3: yes
requirements:
PROJECT: requirements
PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
FROM: base:ubuntu_focal
PYTHON3: yes
- name: ubuntu_bionic
image: ubuntu:bionic
release: master