summaryrefslogtreecommitdiffstats
path: root/opendaylight
diff options
context:
space:
mode:
Diffstat (limited to 'opendaylight')
-rw-r--r--opendaylight/aluminum/aluminum-alpine/pom.xml31
-rw-r--r--opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile3
2 files changed, 34 insertions, 0 deletions
diff --git a/opendaylight/aluminum/aluminum-alpine/pom.xml b/opendaylight/aluminum/aluminum-alpine/pom.xml
index 84d9f307..867bb9e6 100644
--- a/opendaylight/aluminum/aluminum-alpine/pom.xml
+++ b/opendaylight/aluminum/aluminum-alpine/pom.xml
@@ -20,6 +20,7 @@
<properties>
<image.name>onap/ccsdk-odl-aluminum-alpine-image</image.name>
<odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
+ <odl.shiro.version>0.12.1</odl.shiro.version>
</properties>
<build>
@@ -70,6 +71,36 @@
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
+ <execution>
+ <id>copy-with-alternalte-repo-2</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.highstreet-technologies.aaa</groupId>
+ <artifactId>aaa-shiro</artifactId>
+ <version>${odl.shiro.version}</version>
+ <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-shiro/${odl.shiro.version}</outputDirectory>
+ <destFileName>aaa-shiro-${odl.shiro.version}.jar</destFileName>
+ <excludes>*</excludes>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.highstreet-technologies.aaa</groupId>
+ <artifactId>aaa-authn-api</artifactId>
+ <version>${odl.shiro.version}</version>
+ <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version}</outputDirectory>
+ <destFileName>aaa-authn-api-${odl.shiro.version}.jar</destFileName>
+ <excludes>*</excludes>
+ </artifactItem>
+ </artifactItems>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </execution>
</executions>
</plugin>
diff --git a/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile b/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile
index 11eeacd8..9ef70db1 100644
--- a/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile
@@ -13,10 +13,13 @@ RUN mkdir -p /opt/odl \
&& ln -s /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \
&& ln -s /opt/opendaylight /opt/opendaylight/current
+# Patch some opendaylight artifacts
+COPY system $ODL_HOME/system
# Add missing scripts see SDNC-1056
#COPY configure_cluster.sh configure-cluster-ipdetect.sh custom_shard_config.txt set_persistence.sh $ODL_HOME/bin/
#RUN chmod 755 $ODL_HOME/bin/configure_cluster.sh $ODL_HOME/bin/configure-cluster-ipdetect.sh $ODL_HOME/bin/set_persistence.sh $ODL_HOME/bin/custom_shard_config.txt
# ENTRYPOINT exec /opt/opendaylight/bin/karaf
+WORKDIR $ODL_HOME
USER onap
EXPOSE 8181