Skip to content

Commit

Permalink
Reduce layers (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
vweevers committed Aug 1, 2021
1 parent faa0898 commit c7d2ca9
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 38 deletions.
11 changes: 4 additions & 7 deletions android-arm64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
FROM dockcross/android-arm64

RUN groupadd --gid 1000 node && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
RUN groupadd --gid 2000 travis && useradd --uid 2000 --gid travis --shell /bin/bash --create-home travis

RUN apt-get -y update && \
apt-get -y --no-install-recommends install \
git curl gnupg apt-transport-https \
&& \
RUN groupadd --gid 1000 node && useradd --uid 1000 --gid node --shell /bin/bash --create-home node && \
groupadd --gid 2000 travis && useradd --uid 2000 --gid travis --shell /bin/bash --create-home travis && \
apt-get -y update && \
apt-get -y --no-install-recommends install git curl gnupg apt-transport-https && \
curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_10.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x bullseye main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
Expand Down
11 changes: 4 additions & 7 deletions android-armv7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
FROM dockcross/android-arm

RUN groupadd --gid 1000 node && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
RUN groupadd --gid 2000 travis && useradd --uid 2000 --gid travis --shell /bin/bash --create-home travis

RUN apt-get -y update && \
apt-get -y --no-install-recommends install \
git curl gnupg apt-transport-https \
&& \
RUN groupadd --gid 1000 node && useradd --uid 1000 --gid node --shell /bin/bash --create-home node && \
groupadd --gid 2000 travis && useradd --uid 2000 --gid travis --shell /bin/bash --create-home travis && \
apt-get -y update && \
apt-get -y --no-install-recommends install git curl gnupg apt-transport-https && \
curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_10.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x bullseye main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
Expand Down
5 changes: 2 additions & 3 deletions centos7-devtoolset7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ FROM centos/devtoolset-7-toolchain-centos7:7
USER 0

RUN groupadd -g 1000 node && useradd -g 1000 -u 1000 -m node && \
groupadd -g 2000 travis && useradd -g 2000 -u 2000 -m travis

RUN curl -sL https://rpm.nodesource.com/setup_12.x | bash - && \
groupadd -g 2000 travis && useradd -g 2000 -u 2000 -m travis && \
curl -sL https://rpm.nodesource.com/setup_12.x | bash - && \
yum install -y make nodejs

USER node
Expand Down
11 changes: 4 additions & 7 deletions linux-arm64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
FROM dockcross/linux-arm64

RUN groupadd --gid 1000 node && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
RUN groupadd --gid 2000 travis && useradd --uid 2000 --gid travis --shell /bin/bash --create-home travis

RUN apt-get -y update && \
apt-get -y --no-install-recommends install \
git curl gnupg apt-transport-https \
&& \
RUN groupadd --gid 1000 node && useradd --uid 1000 --gid node --shell /bin/bash --create-home node && \
groupadd --gid 2000 travis && useradd --uid 2000 --gid travis --shell /bin/bash --create-home travis && \
apt-get -y update && \
apt-get -y --no-install-recommends install git curl gnupg apt-transport-https && \
curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_10.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x bullseye main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
Expand Down
11 changes: 4 additions & 7 deletions linux-armv6/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
FROM dockcross/linux-armv6

RUN groupadd --gid 1000 node && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
RUN groupadd --gid 2000 travis && useradd --uid 2000 --gid travis --shell /bin/bash --create-home travis

RUN apt-get -y update && \
apt-get -y --no-install-recommends install \
git curl gnupg apt-transport-https \
&& \
RUN groupadd --gid 1000 node && useradd --uid 1000 --gid node --shell /bin/bash --create-home node && \
groupadd --gid 2000 travis && useradd --uid 2000 --gid travis --shell /bin/bash --create-home travis && \
apt-get -y update && \
apt-get -y --no-install-recommends install git curl gnupg apt-transport-https && \
curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_10.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x bullseye main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
Expand Down
11 changes: 4 additions & 7 deletions linux-armv7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
FROM dockcross/linux-armv7

RUN groupadd --gid 1000 node && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
RUN groupadd --gid 2000 travis && useradd --uid 2000 --gid travis --shell /bin/bash --create-home travis

RUN apt-get -y update && \
apt-get -y --no-install-recommends install \
git curl gnupg apt-transport-https \
&& \
RUN groupadd --gid 1000 node && useradd --uid 1000 --gid node --shell /bin/bash --create-home node && \
groupadd --gid 2000 travis && useradd --uid 2000 --gid travis --shell /bin/bash --create-home travis && \
apt-get -y update && \
apt-get -y --no-install-recommends install git curl gnupg apt-transport-https && \
curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_10.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x bullseye main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
Expand Down

0 comments on commit c7d2ca9

Please sign in to comment.