summaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile.aarch64.patch
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-11-09 06:05:06 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-11-09 13:42:11 +0100
commit0705a7ed15f090b3be64f2995d1c9fff51edc2f1 (patch)
tree813d03b2a9a8ab18ee30348eaef7f606b4378bdd /docker/Dockerfile.aarch64.patch
parent112944292c7935e43d978312c633a3bbf16e0559 (diff)
Remove the former Dockerfile
opnfv/functest had been split into multiple containers based on Alpine (See Docker Slicing [1]) during Euphrates. As ARM is being switching to them, we can safely remove the related files. [1] https://git.opnfv.org/functest/tree/docs/com/pres/dockerslicing/dockerslicing.md?h=stable/euphrates Change-Id: I30294a94cc742ba80a7bc4f35db9330240385bb0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/Dockerfile.aarch64.patch')
-rw-r--r--docker/Dockerfile.aarch64.patch62
1 files changed, 0 insertions, 62 deletions
diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch
deleted file mode 100644
index 1257206d2..000000000
--- a/docker/Dockerfile.aarch64.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/docker/Dockerfile b/docker/Dockerfile
-index 0e896d6d..2a8f2b66 100644
---- a/docker/Dockerfile
-+++ b/docker/Dockerfile
-@@ -1,5 +1,5 @@
- ########################################
--# Docker container for FUNCTEST
-+# Aarch64 Docker container for FUNCTEST
- ########################################
- # All rights reserved. This program and the accompanying materials
- # are made available under the terms of the Apache License, Version 2.0
-@@ -7,9 +7,9 @@
- # http://www.apache.org/licenses/LICENSE-2.0
- #
-
--FROM ubuntu:14.04
--MAINTAINER Jose Lausuch <jose.lausuch@ericsson.com>
--LABEL version="0.1" description="OPNFV Functest Docker container"
-+FROM aarch64/ubuntu:14.04
-+MAINTAINER Armband team <armband@enea.com>
-+LABEL version="0.1" description="OPNFV Functest Aarch64 Docker container"
-
- # Environment variables
- ARG BRANCH=master
-@@ -43,6 +43,7 @@ gcc \
- git \
- libffi-dev \
- libgmp3-dev \
-+libjpeg-dev \
- libpq-dev \
- libssl-dev \
- libxml2-dev \
-@@ -103,10 +104,26 @@ RUN /bin/bash -c ". /usr/local/lib/python2.7/dist-packages/sfc/tests/functest/se
- RUN ln -s /src/tempest /src/refstack-client/.tempest \
- && virtualenv --system-site-packages /src/tempest/.venv
-
--RUN cd /src/vims-test && bundle install
-+RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
-+RUN curl -L https://get.rvm.io | bash -s stable
-
--RUN sh -c 'curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -' \
-- && sudo apt-get install -y nodejs \
-+RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
-+ && cd /src/vims-test \
-+ && rvm autolibs enable"
-+RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
-+ && cd /src/vims-test \
-+ && rvm install 1.9.3"
-+RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
-+ && cd /src/vims-test \
-+ && rvm use 1.9.3"
-+RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
-+ && gem install bundler \
-+ && cd /src/vims-test \
-+ && bundle config build.nokogiri --use-system-libraries \
-+ && bundle install"
-+
-+RUN sh -c 'wget -qO- https://nodejs.org/dist/v4.7.2/node-v4.7.2-linux-arm64.tar.gz | \
-+ tar -xz -C /usr/local --exclude=CHANGELOG.md --exclude=LICENSE --exclude=README.md --strip-components 1 '\
- && cd /src/promise && sudo npm -g install npm@latest \
- && cd /src/promise/source && npm install
-