aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun He <jun.he@arm.com>2017-07-13 05:27:19 +0000
committerNaresh Bhat <naresh.bhat@linaro.org>2017-07-26 17:02:39 +0530
commitd6dcf4fa863258b487ef661452a2cde7828f4931 (patch)
treef5f093c140577a8395a95d43c938ebaf5bb726b7
parenta7a238ec2c769e88821899e901482b214c478db6 (diff)
BIGTOP-2841: Fix bigtop/slaves-ubuntu-16.04-aarch64 build failure
Signed-off-by: Konstantin Boudnik <cos@apache.org>
-rw-r--r--docker/bigtop-slaves/ubuntu-16.04-aarch64/Dockerfile5
1 files changed, 2 insertions, 3 deletions
diff --git a/docker/bigtop-slaves/ubuntu-16.04-aarch64/Dockerfile b/docker/bigtop-slaves/ubuntu-16.04-aarch64/Dockerfile
index 336b7cba..f3b30a82 100644
--- a/docker/bigtop-slaves/ubuntu-16.04-aarch64/Dockerfile
+++ b/docker/bigtop-slaves/ubuntu-16.04-aarch64/Dockerfile
@@ -12,12 +12,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM aarch64/ubuntu:16.04
+FROM bigtop/puppet:ubuntu-16.04-aarch64
MAINTAINER Roman Shaposhnik <rvs@apache.org>
COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-RUN /etc/puppet/modules/bigtop_toolchain/bin/puppetize.sh
-RUN puppet apply -e "include bigtop_toolchain::installer"
+RUN apt-get clean && apt-get update && puppet apply -e "include bigtop_toolchain::installer"
COPY . /tmp/bigtop
RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop