Skip to content

Commit

Permalink
getting back to phusion/baseimage
Browse files Browse the repository at this point in the history
  • Loading branch information
noogen committed Apr 27, 2019
1 parent 96ca5d1 commit 545bb7a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM hyperknot/baseimage16:1.0.6
FROM phusion/baseimage:0.10.2
LABEL maintainer="noogen <[email protected]>"
ENV DEBIAN_FRONTEND=noninteractive \
LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 TERM=xterm container=docker
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions FULL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 <[email protected]>"
ENV DEBIAN_FRONTEND=noninteractive \
LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 TERM=xterm container=docker
Expand Down

0 comments on commit 545bb7a

Please sign in to comment.