From 156db2d2c2cac94811237f2486b5d1a47117969c Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Mon, 21 Jul 2025 18:06:28 +0530 Subject: [PATCH] Test commit Issue-ID: OAM-478 Change-Id: I32e750105c7d414159ef0d4db40b1f7368184196 Signed-off-by: Ravi Pendurty --- Makefile | 27 ++++++++++++---------- README.md | 1 + distribution/oam-controller-web/pom.xml | 2 +- .../oam-controller/src/main/docker/Dockerfile | 13 +++++++---- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 69c546a..4db708b 100644 --- a/Makefile +++ b/Makefile @@ -12,28 +12,31 @@ # See the License for the specific language governing permissions and # limitations under the License. +.PHONY: help parents features-wt features-odlux dist all + ## help: Show the help. -.PHONY: help help: @echo "Usage: make " @echo "" @echo "Targets:" @fgrep "##" Makefile | fgrep -v fgrep | sed 's/##/ -/g' +## parents: Build parents +parents: + mvn clean install -f parents/pom.xml -s settings.xml + +## features-wt: Build wt features +features-wt: + mvn clean install -f features/sdnr/wt/pom.xml -s settings.xml -## feature: Build all features -.PHONY: feature -feature: - mvn clean install -f parents/pom.xml - mvn clean install -f features/sdnr/wt/pom.xml - mvn clean install -f features/sdnr/odlux/pom.xml +## features-odlux: Build odlux features +features-odlux: + mvn clean install -f features/sdnr/odlux/pom.xml -s settings.xml ## dist: Build images -.PHONY: dist dist: - mvn clean install -f distribution/oam-controller/pom.xml - mvn clean install -f distribution/oam-controller-web/pom.xml + mvn clean install -f distribution/oam-controller/pom.xml -s settings.xml + mvn clean install -f distribution/oam-controller-web/pom.xml -s settings.xml ## all: Build features and images -.PHONY: all -all: feature dist \ No newline at end of file +all: parents features-wt features-odlux dist diff --git a/README.md b/README.md index 053d7fb..f1cb2d0 100644 --- a/README.md +++ b/README.md @@ -55,3 +55,4 @@ This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENS - GERRIT_PROJECT needs special handling due to the repo naming convention - Test commit to check GHA triggering - Test commit to check GHA triggering +- Test commit to check GHA triggering diff --git a/distribution/oam-controller-web/pom.xml b/distribution/oam-controller-web/pom.xml index 7e6365b..3465076 100644 --- a/distribution/oam-controller-web/pom.xml +++ b/distribution/oam-controller-web/pom.xml @@ -11,7 +11,7 @@ Creates SDN Controller WebUI Docker container - docker.io/bitnami/nginx:1.21-debian-10 + docker.io/bitnami/nginx:1.25-debian-12 o-ran-sc/sdnc-web-image ${project.version} 1.7.0-SNAPSHOT diff --git a/distribution/oam-controller/src/main/docker/Dockerfile b/distribution/oam-controller/src/main/docker/Dockerfile index 9fab1ff..c8f5980 100644 --- a/distribution/oam-controller/src/main/docker/Dockerfile +++ b/distribution/oam-controller/src/main/docker/Dockerfile @@ -24,8 +24,8 @@ RUN apk update && apk --no-cache add gcompat sudo iputils openssl bash unzip rsy # Enable wheel group RUN sed -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' -i /etc/sudoers # Create odl user -RUN addgroup -S odl && adduser -S odl -G odl -RUN addgroup odl wheel +RUN addgroup -S odl && adduser -S odl -G odl && addgroup odl wheel +#RUN addgroup odl wheel # copy ODL COPY --chown=odl:odl odl/karaf-${odl.karaf.version} $ODL_HOME @@ -41,8 +41,11 @@ RUN rsync -a --ignore-existing /tmp/system $ODL_HOME #COPY --chown=odl:odl frinx/org/opendaylight/netconf $ODL_HOME/system/org/opendaylight/netconf/ COPY --chown=odl:odl system/org/apache/kafka $ODL_HOME/system/org/apache/kafka +RUN true COPY --chown=odl:odl system/com/github/luben $ODL_HOME/system/com/github/luben +RUN true COPY --chown=odl:odl system/org/lz4 $ODL_HOME/system/org/lz4 +RUN true COPY --chown=odl:odl system/org/xerial/snappy $ODL_HOME/system/org/xerial/snappy # Patch WT Apps @@ -50,14 +53,16 @@ COPY --chown=odl:odl system/org/xerial/snappy $ODL_HOME/system/org/xerial/snappy #RUN rm -r $ODL_HOME/$FEATURES_SDNR #COPY --chown=odl:odl $FEATURES_SDNR $ODL_HOME/$FEATURES_SDNR # Copy scripts +RUN true COPY --from=stage0 --chown=odl:odl /opt/onap /opt/onap +RUN true COPY --chown=odl:odl scripts/startODL.sh /opt/onap/sdnc/bin/ +RUN true COPY --chown=odl:odl scripts/installCerts.py /opt/onap/sdnc/bin/ # Copy repository # visualVM configuration +RUN true COPY --chown=odl:odl etc $ODL_HOME/etc -# copy bash init script into container -COPY --chown=odl:odl scripts/.bashrc /home/odl/ #Adjust repositories RUN sed -i -e "\|featuresRepositories|s|$|, ${SDNR_DM_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg -- 2.16.6