diff --git a/charts/openstack-utility/values.yaml b/charts/openstack-utility/values.yaml index 632ccea4..43c1fd4d 100644 --- a/charts/openstack-utility/values.yaml +++ b/charts/openstack-utility/values.yaml @@ -12,8 +12,8 @@ release_group: null images: pull_policy: IfNotPresent tags: - openstack_utility: 'docker.io/diwakarthyagaraj/openstackutility:v0.0.2' - image_repo_sync: docker.io/docker:17.07.0 + openstack_utility: 'quay.io/airshipit/porthole-openstack-utility:latest-ubuntu_xenial' + image_repo_sync: docker.io/docker:18.09.02 local_registry: active: false exclude: diff --git a/images/openstack-utility/Dockerfile.ubuntu_xenial b/images/openstack-utility/Dockerfile.ubuntu_xenial index dd4e3a42..4ce213ab 100755 --- a/images/openstack-utility/Dockerfile.ubuntu_xenial +++ b/images/openstack-utility/Dockerfile.ubuntu_xenial @@ -1,31 +1,38 @@ ARG FROM=docker.io/ubuntu:xenial FROM ${FROM} -MAINTAINER Prateek Reddy Dodda + +LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \ + org.opencontainers.image.url='https://airshipit.org' \ + org.opencontainers.image.documentation='https://opendev.org/airship/porthole' \ + org.opencontainers.image.source='https://opendev.org/airship/porthole' \ + org.opencontainers.image.vendor='The Airship Authors' \ + org.opencontainers.image.licenses='Apache-2.0' RUN set -xe \ - && echo '#!/bin/sh' > /usr/sbin/policy-rc.d \ - ## If there is no shebang at the beginning of the file, the OS will try to execute it as a “normal” binary. - && echo 'exit 101' >> /usr/sbin/policy-rc.d \ - && chmod +x /usr/sbin/policy-rc.d \ - ## To prevent services from being started automatically when you install packages with dpkg, apt, etc., - && sed -i '/nobody/d' /etc/passwd \ - && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \ - ## To Restrict User to nobody for User login. - && dpkg-divert --local --rename --add /sbin/initctl \ - && cp -a /usr/sbin/policy-rc.d /sbin/initctl \ - && sed -i 's/^exit.*/exit 0/' /sbin/initctl \ - ## To use an updated version of some application instead of old version existing on your machine. - && echo 'force-unsafe-io' > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup \ - ## Temporarily disable dpkg fsync to make building faster. - && echo 'DPkg::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' > /etc/apt/apt.conf.d/docker-clean \ - && echo 'APT::Update::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' >> /etc/apt/apt.conf.d/docker-clean \ - && echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' >> /etc/apt/apt.conf.d/docker-clean \ - && echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/docker-no-languages \ - && echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' > /etc/apt/apt.conf.d/docker-gzip-indexes \ - && echo 'Apt::AutoRemove::SuggestsImportant "false";' > /etc/apt/apt.conf.d/docker-autoremove-suggests \ - # Docker configurations for base Image - && apt-get update && apt-get install -y bash moreutils vim sudo screen rsyslog x11-apps python-oslo.rootwrap python-openstackclient python-glanceclient python-novaclient python-neutronclient python-cinderclient python-heat python3-oslo.rootwrap python3-openstackclient python3-glanceclient python3-novaclient python3-neutronclient python3-cinderclient \ - ## Install bash utilities,rsyslog,openstack client which is required for Keystone and oslo rootwrap. - && apt-get clean && rm -rf /var/lib/apt/lists/* + && echo '#!/bin/sh' > /usr/sbin/policy-rc.d \ + && echo 'exit 101' >> /usr/sbin/policy-rc.d \ + && chmod +x /usr/sbin/policy-rc.d \ + && sed -i '/nobody/d' /etc/passwd \ + && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \ + && dpkg-divert --local --rename --add /sbin/initctl \ + && cp -a /usr/sbin/policy-rc.d /sbin/initctl \ + && sed -i 's/^exit.*/exit 0/' /sbin/initctl \ + && apt-get update \ + && apt-get install -y \ + bash\ + moreutils \ + sudo \ + rsyslog \ + x11-apps \ + python-oslo.rootwrap \ + python-openstackclient \ + python3-oslo.rootwrap \ + python3-openstackclient \ + python3-glanceclient \ + python3-novaclient \ + python3-neutronclient \ + python3-cinderclient \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* CMD ["/bin/bash"] diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 6703dbe6..c3a2be7f 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -20,8 +20,8 @@ - airship-porthole-images-build-gate-ceph-utility - airship-porthole-images-build-gate-etcdctl-utility - airship-porthole-images-build-gate-mysqlclient-utility + - airship-porthole-images-build-gate-openstack-utility - airship-porthole-images-build-gate-postgresql-utility - gate: jobs: - airship-porthole-linter @@ -29,6 +29,7 @@ - airship-porthole-images-build-gate-ceph-utility - airship-porthole-images-build-gate-etcdctl-utility - airship-porthole-images-build-gate-mysqlclient-utility + - airship-porthole-images-build-gate-openstack-utility - airship-porthole-images-build-gate-postgresql-utility post: @@ -37,6 +38,7 @@ - airship-porthole-images-publish-ceph-utility - airship-porthole-images-publish-etcdctl-utility - airship-porthole-images-publish-mysqlclient-utility + - airship-porthole-images-publish-openstack-utility - airship-porthole-images-publish-postgresql-utility - nodeset: diff --git a/zuul.d/openstack-utility.yaml b/zuul.d/openstack-utility.yaml new file mode 100644 index 00000000..364a545e --- /dev/null +++ b/zuul.d/openstack-utility.yaml @@ -0,0 +1,41 @@ +# Copyright 2019 AT&T Intellectual Property. All other rights reserved. +# +# 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 +# +# https://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. + +- job: + name: airship-porthole-images-build-gate-openstack-utility + parent: &parent airship-porthole-images + vars: + image_name: &image_name porthole-openstack-utility + distro_suffix: &distro_suffix ubuntu_xenial + files: + - ^charts/openstack-utility/.*$ + - ^images/openstack-utility/.*$ + - ^Makefile$ + - ^tools/.*$ + - ^zuul.d/.*$ + +- job: + name: airship-porthole-images-publish-openstack-utility + parent: *parent + secrets: + - name: quay_credentials + secret: quay_credentials + pass-to-parent: true + vars: + image_name: *image_name + distro_suffix: *distro_suffix + publish: true + tags: + dynamic: + commit: true