mirror of
https://github.com/balena-io/etcher.git
synced 2025-07-23 03:06:38 +00:00
chore: make use of resin.io's Docker base images (#1481)
Resin.io already publishes multi-arch Docker base images running Jessie, which is Debian version we wanted before falling back to Ubuntu 12.04. The main reason behind this change is to be able to use other resin.io base images (like ARM ones) without requiring a lot of per-base-image changes. Signed-off-by: Juan Cruz Viotti <jviotti@openmailbox.org>
This commit is contained in:
parent
dcb152aa00
commit
9a3900debb
@ -1,17 +1,15 @@
|
|||||||
FROM erwinchang/ubuntu-12.04-32bit-build
|
FROM resin/i386-debian:jessie
|
||||||
|
|
||||||
# Setup APT sources
|
# Setup APT sources
|
||||||
|
RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list
|
||||||
RUN sed s,ubuntu\.stu\.edu\.tw,archive.ubuntu.com, /etc/apt/sources.list > /tmp/sources.list \
|
|
||||||
&& mv /tmp/sources.list /etc/apt/sources.list
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
curl \
|
curl \
|
||||||
|
dpkg \
|
||||||
|
fakeroot \
|
||||||
fuse \
|
fuse \
|
||||||
git \
|
git \
|
||||||
jq \
|
jq \
|
||||||
@ -20,6 +18,7 @@ RUN apt-get update \
|
|||||||
libgtk2.0-0 \
|
libgtk2.0-0 \
|
||||||
libx11-xcb1 \
|
libx11-xcb1 \
|
||||||
libnss3 \
|
libnss3 \
|
||||||
|
libsass0 \
|
||||||
libxss1 \
|
libxss1 \
|
||||||
libxtst6 \
|
libxtst6 \
|
||||||
libyaml-dev \
|
libyaml-dev \
|
||||||
@ -27,15 +26,12 @@ RUN apt-get update \
|
|||||||
python-pip \
|
python-pip \
|
||||||
python-dev \
|
python-dev \
|
||||||
python-software-properties \
|
python-software-properties \
|
||||||
|
rsync \
|
||||||
unzip \
|
unzip \
|
||||||
xvfb \
|
xvfb \
|
||||||
|
xauth \
|
||||||
zip
|
zip
|
||||||
|
|
||||||
# Install a C++11 compiler
|
|
||||||
RUN add-apt-repository ppa:ubuntu-toolchain-r/test \
|
|
||||||
&& apt-get update && apt-get install -y gcc-4.8 g++-4.8 \
|
|
||||||
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
|
|
||||||
|
|
||||||
# NodeJS
|
# NodeJS
|
||||||
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \
|
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \
|
||||||
&& apt-get install -y nodejs
|
&& apt-get install -y nodejs
|
||||||
|
@ -1,16 +1,15 @@
|
|||||||
FROM ubuntu:12.04
|
FROM resin/amd64-debian:jessie
|
||||||
|
|
||||||
# Setup APT sources
|
# Setup APT sources
|
||||||
|
RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list
|
||||||
|
|
||||||
RUN echo "deb http://archive.ubuntu.com/ubuntu precise-backports main restricted universe multiverse" >> /etc/apt/sources.list
|
|
||||||
|
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
curl \
|
curl \
|
||||||
|
dpkg \
|
||||||
|
fakeroot \
|
||||||
fuse \
|
fuse \
|
||||||
git \
|
git \
|
||||||
jq \
|
jq \
|
||||||
@ -19,6 +18,7 @@ RUN apt-get update \
|
|||||||
libgtk2.0-0 \
|
libgtk2.0-0 \
|
||||||
libx11-xcb1 \
|
libx11-xcb1 \
|
||||||
libnss3 \
|
libnss3 \
|
||||||
|
libsass0 \
|
||||||
libxss1 \
|
libxss1 \
|
||||||
libxtst6 \
|
libxtst6 \
|
||||||
libyaml-dev \
|
libyaml-dev \
|
||||||
@ -26,15 +26,12 @@ RUN apt-get update \
|
|||||||
python-pip \
|
python-pip \
|
||||||
python-dev \
|
python-dev \
|
||||||
python-software-properties \
|
python-software-properties \
|
||||||
|
rsync \
|
||||||
unzip \
|
unzip \
|
||||||
xvfb \
|
xvfb \
|
||||||
|
xauth \
|
||||||
zip
|
zip
|
||||||
|
|
||||||
# Install a C++11 compiler
|
|
||||||
RUN add-apt-repository ppa:ubuntu-toolchain-r/test \
|
|
||||||
&& apt-get update && apt-get install -y gcc-4.8 g++-4.8 \
|
|
||||||
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
|
|
||||||
|
|
||||||
# NodeJS
|
# NodeJS
|
||||||
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \
|
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \
|
||||||
&& apt-get install -y nodejs
|
&& apt-get install -y nodejs
|
||||||
|
@ -1,19 +1,15 @@
|
|||||||
FROM <%= image %>
|
FROM <%= image %>
|
||||||
|
|
||||||
# Setup APT sources
|
# Setup APT sources
|
||||||
<% if (architecture == 'i686') { %>
|
RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list
|
||||||
RUN sed s,ubuntu\.stu\.edu\.tw,archive.ubuntu.com, /etc/apt/sources.list > /tmp/sources.list \
|
|
||||||
&& mv /tmp/sources.list /etc/apt/sources.list
|
|
||||||
<% } %>
|
|
||||||
<% if (architecture == 'x86_64') { %>
|
|
||||||
RUN echo "deb http://archive.ubuntu.com/ubuntu precise-backports main restricted universe multiverse" >> /etc/apt/sources.list
|
|
||||||
<% } %>
|
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
curl \
|
curl \
|
||||||
|
dpkg \
|
||||||
|
fakeroot \
|
||||||
fuse \
|
fuse \
|
||||||
git \
|
git \
|
||||||
jq \
|
jq \
|
||||||
@ -22,6 +18,7 @@ RUN apt-get update \
|
|||||||
libgtk2.0-0 \
|
libgtk2.0-0 \
|
||||||
libx11-xcb1 \
|
libx11-xcb1 \
|
||||||
libnss3 \
|
libnss3 \
|
||||||
|
libsass0 \
|
||||||
libxss1 \
|
libxss1 \
|
||||||
libxtst6 \
|
libxtst6 \
|
||||||
libyaml-dev \
|
libyaml-dev \
|
||||||
@ -29,15 +26,12 @@ RUN apt-get update \
|
|||||||
python-pip \
|
python-pip \
|
||||||
python-dev \
|
python-dev \
|
||||||
python-software-properties \
|
python-software-properties \
|
||||||
|
rsync \
|
||||||
unzip \
|
unzip \
|
||||||
xvfb \
|
xvfb \
|
||||||
|
xauth \
|
||||||
zip
|
zip
|
||||||
|
|
||||||
# Install a C++11 compiler
|
|
||||||
RUN add-apt-repository ppa:ubuntu-toolchain-r/test \
|
|
||||||
&& apt-get update && apt-get install -y gcc-4.8 g++-4.8 \
|
|
||||||
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
|
|
||||||
|
|
||||||
# NodeJS
|
# NodeJS
|
||||||
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \
|
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \
|
||||||
&& apt-get install -y nodejs
|
&& apt-get install -y nodejs
|
||||||
|
@ -31,11 +31,11 @@ const template = fs.readFileSync(path.join(currentDirectory, 'Dockerfile.templat
|
|||||||
_.each([
|
_.each([
|
||||||
{
|
{
|
||||||
architecture: 'i686',
|
architecture: 'i686',
|
||||||
image: 'erwinchang/ubuntu-12.04-32bit-build'
|
image: 'resin/i386-debian:jessie'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
architecture: 'x86_64',
|
architecture: 'x86_64',
|
||||||
image: 'ubuntu:12.04'
|
image: 'resin/amd64-debian:jessie'
|
||||||
}
|
}
|
||||||
], (options) => {
|
], (options) => {
|
||||||
const result = _.template(template)(options);
|
const result = _.template(template)(options);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user