Switch to loci org
The secret needed to be updated to make this work. Now we are pushing to quay.io as well, both under the same loci namespace Change-Id: I086aec21c2ebe69bcdf0aa25749280d8878f946d
This commit is contained in:
parent
bed0d6004e
commit
aeff89ce24
@ -13,13 +13,13 @@
|
||||
h1VsAOJ0Qo4qq1K/ft95ypd+vtjkfepEgHEBmJNwutJa9IHAkGfrkO9VkpUTPpfffnPwz
|
||||
d0/zaaadNl6MLQUSutRwY23YIIbv+fmukxw2vnJmvn6abkBlMya7KgtifwNA8c=
|
||||
password: !encrypted/pkcs1-oaep
|
||||
- gUEX4eY3JAk/Xt7Evmf/hF7xr6HpNRXTibZjrKTbmI4QYHlzEBrBbHey27Pt/eYvKKeKw
|
||||
hk8MDQ4rNX7ZK1v+CKTilUfOf4AkKYbe6JFDd4z+zIZ2PAA7ZedO5FY/OnqrG7nhLvQHE
|
||||
5nQrYwmxRp4O8eU5qG1dSrM9X+bzri8UnsI7URjqmEsIvlUqtybQKB9qQXT4d6mOeaKGE
|
||||
5h6Ydkb9Zdi4Qh+GpCGDYwHZKu1mBgVK5M1G6NFMy1DYz+4NJNkTRe9J+0TmWhQ/KZSqo
|
||||
4ck0x7Tb0Nr7hQzV8SxlwkaCTLDzvbiqmsJPLmzXY2jry6QsaRCpthS01vnj47itoZ/7p
|
||||
taH9CoJ0Gl7AkaxsrDSVjWSjatTQpsy1ub2fuzWHH4ASJFCiu83Lb2xwYts++r8ZSn+mA
|
||||
hbEs0GzPI6dIWg0u7aUsRWMOB4A+6t2IOJibVYwmwkG8TjHRXxVCLH5sY+i3MR+NicR9T
|
||||
IZFdY/AyH6vt5uHLQDU35+5n91pUG3F2lyiY5aeMOvBL05p27GTMuixR5ZoHcvSoHHtCq
|
||||
7Wnk21iHqmv/UnEzqUfXZOque9YP386RBWkshrHd0x3OHUfBK/WrpivxvIGBzGwMr2qAj
|
||||
/AhJsfDXKBBbhGOGk1u5oBLjeC4SRnAcIVh1+RWzR4/cAhOuy2EcbzxaGb6VTM=
|
||||
- oNdrnb4wteFvyQs40rjM7vXb1tu2Pyeq5txLovD+tmImSJ3RPob75oEjTw7jsoEk8G/sP
|
||||
tGpb1w1M3ViE6+hX8lG0CKdT9/SLXSp1q0Qk1AGcYvutVNVZZiKTsVBx+ZBaVN9dAUZsh
|
||||
/A+N/DjzUKuUAYTo2C6KMLJomlGz6TYppyRfnHKnHuhSDCeW6Z+w6VFITGWfwlVjLvc2e
|
||||
DNQ9eLsn74hnmbi5NBCVlHjtsRJjpkdXPcVxzDpxgOleNrKhKD6OvWK/XmcIHXftKL6UC
|
||||
j6m+V7zupwiCEu/A+KoHMZoNLkzsv8c/LgBRgxDNtm+0t3aZVp6pzUplvfTmqunaHCXbP
|
||||
uLsKm8BKgzw2ENXGOcRGIUsmxVDfO7BJO0hcR33Hj4i25iAdVLzF55E1Atm4QvGscVMNd
|
||||
bEWilK6aQlqpRhmIMUyBtQoCqtqcyEEQfEeDlrfE0neCUpj71JNLj2q58sx2g7mN5yeyk
|
||||
kY06VdEHZBdQ4jC7tRG21aBVMaL0pFxGLCRnPT5EWbzZmXsD66WzAYPRvOf2r5ahRQA5i
|
||||
Mi7Yk6kBBWNTPTTOhKss6V9uMu6ml5FBX08uHVn6IZf+5CCcTrkfwBOgTfJnCDGxZP+qy
|
||||
BgwA0Rn78yt6jVDcSZar8BheIe78liCd7pPTE2/2RgqRCoSGaLTy9EvunuJ7Z8=
|
||||
|
@ -3,7 +3,7 @@ FROM ${FROM}
|
||||
|
||||
ENV PATH=/var/lib/openstack/bin:$PATH
|
||||
ARG PROJECT
|
||||
ARG WHEELS=openstackloci/requirements:master-ubuntu
|
||||
ARG WHEELS=loci/requirements:master-ubuntu
|
||||
ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT}
|
||||
ARG PROJECT_REF=master
|
||||
ARG DISTRO
|
||||
|
16
README.md
16
README.md
@ -23,11 +23,11 @@ by LOCI. For simplicity, we will continue to use Keystone as an example.
|
||||
|
||||
|
||||
### Keystone Image Layer Info
|
||||
[![](https://images.microbadger.com/badges/version/openstackloci/keystone:debian.svg)](https://microbadger.com/images/openstackloci/keystone:debian "openstackloci/keystone:debian") [![](https://images.microbadger.com/badges/image/openstackloci/keystone:debian.svg)](https://microbadger.com/images/openstackloci/keystone:debian "openstackloci/keystone:debian")
|
||||
[![](https://images.microbadger.com/badges/version/loci/keystone:debian.svg)](https://microbadger.com/images/loci/keystone:debian "loci/keystone:debian") [![](https://images.microbadger.com/badges/image/loci/keystone:debian.svg)](https://microbadger.com/images/loci/keystone:debian "loci/keystone:debian")
|
||||
|
||||
[![](https://images.microbadger.com/badges/version/openstackloci/keystone:ubuntu.svg)](https://microbadger.com/images/openstackloci/keystone:ubuntu "openstackloci/keystone:ubuntu") [![](https://images.microbadger.com/badges/image/openstackloci/keystone:ubuntu.svg)](https://microbadger.com/images/openstackloci/keystone:ubuntu "openstackloci/keystone:ubuntu")
|
||||
[![](https://images.microbadger.com/badges/version/loci/keystone:ubuntu.svg)](https://microbadger.com/images/loci/keystone:ubuntu "loci/keystone:ubuntu") [![](https://images.microbadger.com/badges/image/loci/keystone:ubuntu.svg)](https://microbadger.com/images/loci/keystone:ubuntu "loci/keystone:ubuntu")
|
||||
|
||||
[![](https://images.microbadger.com/badges/version/openstackloci/keystone:centos.svg)](https://microbadger.com/images/openstackloci/keystone:centos "openstackloci/keystone:centos") [![](https://images.microbadger.com/badges/image/openstackloci/keystone:centos.svg)](https://microbadger.com/images/openstackloci/keystone:centos "openstackloci/keystone:centos")
|
||||
[![](https://images.microbadger.com/badges/version/loci/keystone:centos.svg)](https://microbadger.com/images/loci/keystone:centos "loci/keystone:centos") [![](https://images.microbadger.com/badges/image/loci/keystone:centos.svg)](https://microbadger.com/images/loci/keystone:centos "loci/keystone:centos")
|
||||
|
||||
|
||||
### Building locally
|
||||
@ -100,13 +100,13 @@ $ docker build https://git.openstack.org/openstack/loci.git \
|
||||
|
||||
### Customizing
|
||||
The images should contain all the required assets for running the service. But
|
||||
if you wish or need to customize the `openstackloci/keystone` image that's
|
||||
great! We hope to have built the images to make this as easy and flexible as
|
||||
possible. To do this we recommend that you perform any required customisation
|
||||
in a child image using a pattern similar to:
|
||||
if you wish or need to customize the `loci/keystone` image that's great! We
|
||||
hope to have built the images to make this as easy and flexible as possible. To
|
||||
do this we recommend that you perform any required customisation in a child
|
||||
image using a pattern similar to:
|
||||
|
||||
``` Dockerfile
|
||||
FROM openstackloci/keystone:master-ubuntu
|
||||
FROM loci/keystone:master-ubuntu
|
||||
MAINTAINER you@example.com
|
||||
|
||||
RUN set -x \
|
||||
|
@ -9,9 +9,9 @@
|
||||
- name: Gather wheels to local registry
|
||||
block:
|
||||
- docker_image:
|
||||
name: openstackloci/requirements
|
||||
name: loci/requirements
|
||||
tag: "{{ branch }}-{{ item.name }}"
|
||||
repository: 172.17.0.1:5000/openstackloci/requirements
|
||||
repository: 172.17.0.1:5000/loci/requirements
|
||||
push: yes
|
||||
with_items: "{{ distros }}"
|
||||
async: 1000
|
||||
@ -53,7 +53,7 @@
|
||||
block:
|
||||
- docker_image:
|
||||
path: "{{ loci_src_dir }}"
|
||||
name: openstackloci/{{ project }}
|
||||
name: loci/{{ project }}
|
||||
tag: "{{ branch }}-{{ item.name }}"
|
||||
pull: False
|
||||
buildargs: "{{ item.buildargs.project }}"
|
||||
|
@ -6,5 +6,14 @@
|
||||
block:
|
||||
- command: docker login -u {{ loci_docker_login.user }} -p {{ loci_docker_login.password }}
|
||||
no_log: True
|
||||
- command: docker push openstackloci/{{ project }}:{{ branch }}-{{ item.name }}
|
||||
- command: docker push loci/{{ project }}:{{ branch }}-{{ item.name }}
|
||||
with_items: "{{ distros }}"
|
||||
|
||||
- name: Push project to quay.io
|
||||
block:
|
||||
- command: docker login -u {{ loci_docker_login.user }} -p {{ loci_docker_login.password }} quay.io
|
||||
no_log: True
|
||||
- command: docker tag loci/{{ project }}:{{ branch }}-{{ item.name }} quay.io/loci/{{ project }}:{{ branch }}-{{ item.name }}
|
||||
with_items: "{{ distros }}"
|
||||
- command: docker push quay.io/loci/{{ project }}:{{ branch }}-{{ item.name }}
|
||||
with_items: "{{ distros }}"
|
||||
|
@ -24,7 +24,7 @@ distros:
|
||||
project:
|
||||
PROJECT: "{{ project }}"
|
||||
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
|
||||
WHEELS: 172.17.0.1:5000/openstackloci/requirements:{{ branch }}-centos
|
||||
WHEELS: 172.17.0.1:5000/loci/requirements:{{ branch }}-centos
|
||||
FROM: base:centos
|
||||
- name: ubuntu
|
||||
image: ubuntu:xenial
|
||||
@ -39,7 +39,7 @@ distros:
|
||||
project:
|
||||
PROJECT: "{{ project }}"
|
||||
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
|
||||
WHEELS: 172.17.0.1:5000/openstackloci/requirements:{{ branch }}-ubuntu
|
||||
WHEELS: 172.17.0.1:5000/loci/requirements:{{ branch }}-ubuntu
|
||||
FROM: base:ubuntu
|
||||
- name: debian
|
||||
image: debian:stretch
|
||||
@ -55,5 +55,5 @@ distros:
|
||||
project:
|
||||
PROJECT: "{{ project }}"
|
||||
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
|
||||
WHEELS: 172.17.0.1:5000/openstackloci/requirements:master-debian
|
||||
WHEELS: 172.17.0.1:5000/loci/requirements:master-debian
|
||||
FROM: base:debian
|
||||
|
Loading…
Reference in New Issue
Block a user