Commit 2117bcf0 authored by Raphael Defosseux's avatar Raphael Defosseux

[OC] use correct branch in build-config

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@openairinterface.org>
parent ed7de74c
../docker/Dockerfile.ubuntu18.04
\ No newline at end of file
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
## Pre-requisite ## ## Pre-requisite ##
To build our images, we SHALL use the `codeready-builder-for-rhel-8-x86_64-rpms` repository with all the proper development libraries.
This repository is not directly accessible from the UBI RHEL8 image (`registry.access.redhat.com/ubi8/ubi:latest`).
So we need to copy, from a registered RHEL8 machine, certificates and subsccription manager configuration files.
On a `RHEL8` physical machine (or a virtual machine) connected to the OpenShift Cluster, recover the entitlement and the RH subscription manager configs: On a `RHEL8` physical machine (or a virtual machine) connected to the OpenShift Cluster, recover the entitlement and the RH subscription manager configs:
```bash ```bash
...@@ -17,14 +23,14 @@ These configmaps and secret will be shared by all the build configs in your OC p ...@@ -17,14 +23,14 @@ These configmaps and secret will be shared by all the build configs in your OC p
On a machine connected to the OpenShift Cluster, create the target image stream and the build configuration. On a machine connected to the OpenShift Cluster, create the target image stream and the build configuration.
Note that the project name is currently hard-coded to `oai-cn`. Note that the project name is currently hard-coded to `oai`.
**TODO: pass as env variables: branch name, image tag and project name** **TODO: pass as env variables: branch name, image tag and project name**
```bash ```bash
git clone https://github.com/OPENAIRINTERFACE/openair-spgwu-tiny.git git clone https://github.com/OPENAIRINTERFACE/openair-spgwu-tiny.git
cd openair-spgwu-tiny cd openair-spgwu-tiny
git checkout dockerfile-improvements-2020-08 git checkout develop
oc apply -f openshift/oai-spgwu-tiny-image-stream.yml oc apply -f openshift/oai-spgwu-tiny-image-stream.yml
oc apply -f openshift/oai-spgwu-tiny-build-config.yml oc apply -f openshift/oai-spgwu-tiny-build-config.yml
``` ```
...@@ -49,7 +55,7 @@ You should see a successful buid when : ...@@ -49,7 +55,7 @@ You should see a successful buid when :
```bash ```bash
... ...
Pushing image image-registry.openshift-image-registry.svc:5000/oai-cn/oai-spgwu-tiny:onap-test ... Pushing image image-registry.openshift-image-registry.svc:5000/oai/oai-spgwu-tiny:onap-0.1.0 ...
Getting image source signatures Getting image source signatures
Copying blob sha256:087e0da17c56af1aaf0a1eba37169b46f6c46936b554b7e13f11165dac4ba8ef Copying blob sha256:087e0da17c56af1aaf0a1eba37169b46f6c46936b554b7e13f11165dac4ba8ef
... ...
...@@ -57,6 +63,6 @@ Copying blob sha256:0adcf0e0c86fbba84ed7a22a57a2cd4d7695c1ce858dd03f03dc3002880b ...@@ -57,6 +63,6 @@ Copying blob sha256:0adcf0e0c86fbba84ed7a22a57a2cd4d7695c1ce858dd03f03dc3002880b
Copying config sha256:73330dfa1a733335355324848a02ba1899f9d125559979f9911f3dedcd4450ca Copying config sha256:73330dfa1a733335355324848a02ba1899f9d125559979f9911f3dedcd4450ca
Writing manifest to image destination Writing manifest to image destination
Storing signatures Storing signatures
Successfully pushed image-registry.openshift-image-registry.svc:5000/oai-cn/oai-spgwu-tiny@sha256:c1de087af5515d22e40486fb181f6ff65a7f34788d8174aa122d686667042cf9 Successfully pushed image-registry.openshift-image-registry.svc:5000/oai/oai-spgwu-tiny@sha256:c1de087af5515d22e40486fb181f6ff65a7f34788d8174aa122d686667042cf9
Push successful Push successful
``` ```
...@@ -29,7 +29,7 @@ spec: ...@@ -29,7 +29,7 @@ spec:
source: source:
git: git:
uri: "https://github.com/OPENAIRINTERFACE/openair-spgwu-tiny.git" uri: "https://github.com/OPENAIRINTERFACE/openair-spgwu-tiny.git"
ref: "helm3.1-onap-sync-with-cn-split-repos" ref: "develop"
httpProxy: http://proxy.eurecom.fr:8080 httpProxy: http://proxy.eurecom.fr:8080
httpsProxy: https://proxy.eurecom.fr:8080 httpsProxy: https://proxy.eurecom.fr:8080
secrets: secrets:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment