From 57fde5ae7c8e9764e759e85aa45a42f9b9663d07 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Tue, 18 Jul 2017 12:17:31 +0200 Subject: [PATCH] feat(Dockerfile): use portainer/base image (#1045) --- build/linux/Dockerfile | 2 +- gruntfile.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/linux/Dockerfile b/build/linux/Dockerfile index 299b9bd23..e16144acc 100644 --- a/build/linux/Dockerfile +++ b/build/linux/Dockerfile @@ -1,4 +1,4 @@ -FROM centurylink/ca-certs +FROM portainer/base COPY dist / diff --git a/gruntfile.js b/gruntfile.js index 844683369..95ee9184e 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -4,7 +4,7 @@ var loadGruntTasks = require('load-grunt-tasks'); module.exports = function (grunt) { - loadGruntTasks(grunt); + loadGruntTasks(grunt); grunt.registerTask('default', ['eslint', 'build']); grunt.registerTask('before-copy', [ @@ -180,7 +180,7 @@ module.exports = function (grunt) { run: { command: [ 'docker rm -f portainer', - 'docker run -d -p 9000:9000 -v $(pwd)/dist:/app -v /tmp/portainer:/data -v /var/run/docker.sock:/var/run/docker.sock:z --name portainer centurylink/ca-certs /app/portainer-linux-amd64 --no-analytics -a /app' + 'docker run -d -p 9000:9000 -v $(pwd)/dist:/app -v /tmp/portainer:/data -v /var/run/docker.sock:/var/run/docker.sock:z --name portainer portainer/base /app/portainer-linux-amd64 --no-analytics -a /app' ].join(';') } },