summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2018-02-27 02:34:49 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-27 02:34:49 +0000
commit77ae820a212698e0184fa84220d71d6ece0de3e3 (patch)
tree758ddde999abea4af227e46aa6a8920b8a020917
parent6db2a303546afa13d356f93eb26e76034a7208ef (diff)
parent12e2dc43f731394f3a5894cdca0d48e00c269ec3 (diff)
Merge "compass-deck: support arm64"
-rw-r--r--compass-deck/Dockerfile-arm6425
-rwxr-xr-xcompass-deck/build.sh3
2 files changed, 27 insertions, 1 deletions
diff --git a/compass-deck/Dockerfile-arm64 b/compass-deck/Dockerfile-arm64
new file mode 100644
index 0000000..3bde0ae
--- /dev/null
+++ b/compass-deck/Dockerfile-arm64
@@ -0,0 +1,25 @@
+FROM centos:7
+
+ENV container docker
+ARG BRANCH=master
+
+RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd
+
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*;\
+rm -f /etc/systemd/system/*.wants/*;\
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*;\
+rm -f /lib/systemd/system/anaconda.target.wants/*;\
+yum clean all
+
+ADD . /root/compass-deck
+
+RUN /root/compass-deck/build.sh
+
+EXPOSE 80
+
+CMD ["/sbin/init", "/usr/local/bin/start.sh"]
diff --git a/compass-deck/build.sh b/compass-deck/build.sh
index 23cf48c..6049eb9 100755
--- a/compass-deck/build.sh
+++ b/compass-deck/build.sh
@@ -48,7 +48,8 @@ cp -f $COMPASS_DIR/misc/apache/{ods-server.conf,http_pip.conf,images.conf,packag
cp -rf $COMPASS_DIR/bin/* /opt/compass/bin/
mkdir -p /var/www/compass
ln -s -f /opt/compass/bin/compass_wsgi.py /var/www/compass/compass.wsgi
-cp -rf /usr/lib64/libcrypto.so.6 /usr/lib64/libcrypto.so
+# libcrypto.so.6 doesn't exist on arm64
+cp -rf /usr/lib64/libcrypto.so.6 /usr/lib64/libcrypto.so || true
mkdir -p /var/log/compass
chmod -R 777 /var/log/compass