From 545bb7af36b87bd047eed29d4d79dd0beb988753 Mon Sep 17 00:00:00 2001 From: noogen Date: Fri, 26 Apr 2019 19:23:41 -0500 Subject: [PATCH] getting back to phusion/baseimage --- Dockerfile | 4 ++-- FULL.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7be0a16..72e68cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM hyperknot/baseimage16:1.0.6 +FROM phusion/baseimage:0.10.2 LABEL maintainer="noogen " ENV DEBIAN_FRONTEND=noninteractive \ LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 TERM=xterm container=docker @@ -41,7 +41,7 @@ RUN cd /tmp \ && dpkg -i /tmp/python-support_1.0.15_all.deb \ && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 \ && add-apt-repository 'deb [arch=amd64,i386] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.2/ubuntu xenial main' \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \ + && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 91FA4AD5 \ && echo 'deb [arch=amd64,i386] http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse' \ | sudo tee /etc/apt/sources.list.d/mongodb-3.6.list \ && apt-get update && apt-get -y --no-install-recommends upgrade \ diff --git a/FULL.md b/FULL.md index 12ac51f..64e0552 100644 --- a/FULL.md +++ b/FULL.md @@ -2,7 +2,7 @@ Because full build of v8 takes too long causing docker hub to cancel build, we have to include v8 as part of this build. Though, this would the script to use if one wish to build locally. ``` -FROM hyperknot/baseimage16:1.0.6 as v8builder +FROM phusion/baseimage:0.10.2 as v8builder ENV V8_VERSION=6.8.275.32 RUN apt-get update && \ apt-get install -y \ @@ -22,7 +22,7 @@ RUN apt-get update && \ tools/dev/v8gen.py -vv x64.release -- is_component_build=true && \ ninja -C out.gn/x64.release/ -FROM hyperknot/baseimage16:1.0.6 +FROM phusion/baseimage:0.10.2 LABEL maintainer="noogen " ENV DEBIAN_FRONTEND=noninteractive \ LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 TERM=xterm container=docker