airship/drydock
Code Issues Proposed changes

Drydock updates

Browse Source 
This PS makes the following changes:

- increases timeout for docker images build jobs
- adds available security updates to docker images

Change-Id: Ib10309bab017e864d14cad2dec816645220fba06
This commit is contained in:
Sergiy Markin 2023-08-24 01:45:45 +00:00
parent 613dd89fb0
commit 25456d677b
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.zuul.yaml
View File

@ -99,7 +99,7 @@
- job: - job:
name: airship-drydock-docker-build-gate-ubuntu_focal name: airship-drydock-docker-build-gate-ubuntu_focal
timeout: 1800 timeout: 3600
run: tools/gate/playbooks/docker-image-build.yaml run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-drydock-single-node-focal nodeset: airship-drydock-single-node-focal
irrelevant-files: irrelevant-files:
@ -115,7 +115,7 @@
- job: - job:
name: airship-drydock-docker-build-gate-ubuntu_bionic name: airship-drydock-docker-build-gate-ubuntu_bionic
timeout: 1800 timeout: 3600
run: tools/gate/playbooks/docker-image-build.yaml run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-drydock-single-node nodeset: airship-drydock-single-node
irrelevant-files: irrelevant-files:
@ -131,7 +131,7 @@
- job: - job:
name: airship-drydock-docker-publish-ubuntu_focal name: airship-drydock-docker-publish-ubuntu_focal
timeout: 1800 timeout: 3600
run: tools/gate/playbooks/docker-image-build.yaml run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-drydock-single-node-focal nodeset: airship-drydock-single-node-focal
secrets: secrets:
@ -151,7 +151,7 @@
- job: - job:
name: airship-drydock-docker-publish-ubuntu_bionic name: airship-drydock-docker-publish-ubuntu_bionic
timeout: 1800 timeout: 3600
run: tools/gate/playbooks/docker-image-build.yaml run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-drydock-single-node-focal nodeset: airship-drydock-single-node-focal
secrets: secrets:

1
images/drydock/Dockerfile.ubuntu_bionic
View File

@ -44,6 +44,7 @@ RUN ./baclient_build.sh /tmp/drydock/go /tmp/drydock/baclient
# Build LibYAML # Build LibYAML
ARG LIBYAML_VERSION=0.2.5 ARG LIBYAML_VERSION=0.2.5
RUN set -ex \ RUN set -ex \
&& apt-get update && apt-get upgrade -y \
&& apt install -y git automake make libtool \ && apt install -y git automake make libtool \
&& git clone https://github.com/yaml/libyaml.git \ && git clone https://github.com/yaml/libyaml.git \
&& cd libyaml \ && cd libyaml \

1
images/drydock/Dockerfile.ubuntu_focal
View File

@ -46,6 +46,7 @@ RUN ./baclient_build.sh /tmp/drydock/go /tmp/drydock/baclient
# Build LibYAML # Build LibYAML
ARG LIBYAML_VERSION=0.2.5 ARG LIBYAML_VERSION=0.2.5
RUN set -ex \ RUN set -ex \
&& apt-get update && apt-get upgrade -y \
&& apt install -y git automake make libtool \ && apt install -y git automake make libtool \
&& git clone https://github.com/yaml/libyaml.git \ && git clone https://github.com/yaml/libyaml.git \
&& cd libyaml \ && cd libyaml \

8
tools/gate/playbooks/docker-image-build.yaml
View File

@ -20,7 +20,6 @@
- ensure-python - ensure-python
- ensure-pip - ensure-pip
tasks: tasks:
- name: Debug tag generation inputs - name: Debug tag generation inputs
block: block:
@ -56,6 +55,13 @@
executable: pip3 executable: pip3
become: True become: True
- name: Install tox python module for ansible docker login
block:
- pip:
name: tox
version: 3.28.0
executable: pip3
become: True
- name: Run images - name: Run images
shell: | shell: |