From a023629cecd41c5eade6f0ea357101a51b068651 Mon Sep 17 00:00:00 2001 From: Sullivan SENECHAL Date: Tue, 3 Oct 2017 00:21:15 +0200 Subject: [PATCH] Common package install for Yarn --- 7.0/Dockerfile | 8 +++----- 7.0/alpine/Dockerfile | 11 ++--------- 7.0/apache/Dockerfile | 8 +++----- 7.0/fpm/Dockerfile | 8 +++----- 7.0/fpm/alpine/Dockerfile | 11 ++--------- 7.1/Dockerfile | 8 +++----- 7.1/alpine/Dockerfile | 11 ++--------- 7.1/apache/Dockerfile | 8 +++----- 7.1/fpm/Dockerfile | 8 +++----- 7.1/fpm/alpine/Dockerfile | 11 ++--------- base-alpine.Dockerfile | 8 -------- base-debian.Dockerfile | 5 +---- env.Dockerfile | 3 ++- 13 files changed, 29 insertions(+), 79 deletions(-) diff --git a/7.0/Dockerfile b/7.0/Dockerfile index 4c2317e..fda9205 100644 --- a/7.0/Dockerfile +++ b/7.0/Dockerfile @@ -27,7 +27,8 @@ ENV TOOLS_PACKAGES \ curl \ git \ openssh-client \ - mysql-client + mysql-client \ + yarn ADD configure.sh /usr/local/bin/configure RUN chmod u+x /usr/local/bin/configure @@ -61,10 +62,7 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ # Special Yarn apt setup RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ -&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ -&& apt-get update \ -&& apt-get install yarn \ -&& rm --recursive --force /var/lib/apt/lists/* +&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list # Extra languages needed for tools RUN apt-get update && apt-get install --yes \ diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile index b056702..cde26a1 100644 --- a/7.0/alpine/Dockerfile +++ b/7.0/alpine/Dockerfile @@ -27,7 +27,8 @@ ENV TOOLS_PACKAGES \ curl \ git \ openssh-client \ - mysql-client + mysql-client \ + yarn ADD configure.sh /usr/local/bin/configure RUN chmod u+x /usr/local/bin/configure @@ -79,14 +80,6 @@ RUN set -xe \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ${PHP_EXTENSIONS} \ && apk del .build-deps -# Yarn setup -ADD https://yarnpkg.com/latest.tar.gz /opt/yarn.tar.gz -RUN cd /opt \ - && mkdir yarn \ - && tar xzf yarn.tar.gz -C yarn --strip-components 1 \ - && cd /usr/local/bin \ - && ln -s /opt/yarn/bin/yarn - # Composer ENV COMPOSER_HOME /home/developer/.composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile index ec1ce40..f11a2e9 100644 --- a/7.0/apache/Dockerfile +++ b/7.0/apache/Dockerfile @@ -27,7 +27,8 @@ ENV TOOLS_PACKAGES \ curl \ git \ openssh-client \ - mysql-client + mysql-client \ + yarn ADD configure.sh /usr/local/bin/configure RUN chmod u+x /usr/local/bin/configure @@ -61,10 +62,7 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ # Special Yarn apt setup RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ -&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ -&& apt-get update \ -&& apt-get install yarn \ -&& rm --recursive --force /var/lib/apt/lists/* +&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list # Extra languages needed for tools RUN apt-get update && apt-get install --yes \ diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile index b3cf15c..7cc1a31 100644 --- a/7.0/fpm/Dockerfile +++ b/7.0/fpm/Dockerfile @@ -27,7 +27,8 @@ ENV TOOLS_PACKAGES \ curl \ git \ openssh-client \ - mysql-client + mysql-client \ + yarn ADD configure.sh /usr/local/bin/configure RUN chmod u+x /usr/local/bin/configure @@ -61,10 +62,7 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ # Special Yarn apt setup RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ -&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ -&& apt-get update \ -&& apt-get install yarn \ -&& rm --recursive --force /var/lib/apt/lists/* +&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list # Extra languages needed for tools RUN apt-get update && apt-get install --yes \ diff --git a/7.0/fpm/alpine/Dockerfile b/7.0/fpm/alpine/Dockerfile index b4e37cd..cc16a2b 100644 --- a/7.0/fpm/alpine/Dockerfile +++ b/7.0/fpm/alpine/Dockerfile @@ -27,7 +27,8 @@ ENV TOOLS_PACKAGES \ curl \ git \ openssh-client \ - mysql-client + mysql-client \ + yarn ADD configure.sh /usr/local/bin/configure RUN chmod u+x /usr/local/bin/configure @@ -79,13 +80,5 @@ RUN set -xe \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ${PHP_EXTENSIONS} \ && apk del .build-deps -# Yarn setup -ADD https://yarnpkg.com/latest.tar.gz /opt/yarn.tar.gz -RUN cd /opt \ - && mkdir yarn \ - && tar xzf yarn.tar.gz -C yarn --strip-components 1 \ - && cd /usr/local/bin \ - && ln -s /opt/yarn/bin/yarn - RUN docker-php-ext-enable \ xdebug diff --git a/7.1/Dockerfile b/7.1/Dockerfile index a5b06f8..3070689 100644 --- a/7.1/Dockerfile +++ b/7.1/Dockerfile @@ -27,7 +27,8 @@ ENV TOOLS_PACKAGES \ curl \ git \ openssh-client \ - mysql-client + mysql-client \ + yarn ADD configure.sh /usr/local/bin/configure RUN chmod u+x /usr/local/bin/configure @@ -61,10 +62,7 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ # Special Yarn apt setup RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ -&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ -&& apt-get update \ -&& apt-get install yarn \ -&& rm --recursive --force /var/lib/apt/lists/* +&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list # Extra languages needed for tools RUN apt-get update && apt-get install --yes \ diff --git a/7.1/alpine/Dockerfile b/7.1/alpine/Dockerfile index 23f2ec7..5347dea 100644 --- a/7.1/alpine/Dockerfile +++ b/7.1/alpine/Dockerfile @@ -27,7 +27,8 @@ ENV TOOLS_PACKAGES \ curl \ git \ openssh-client \ - mysql-client + mysql-client \ + yarn ADD configure.sh /usr/local/bin/configure RUN chmod u+x /usr/local/bin/configure @@ -79,14 +80,6 @@ RUN set -xe \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ${PHP_EXTENSIONS} \ && apk del .build-deps -# Yarn setup -ADD https://yarnpkg.com/latest.tar.gz /opt/yarn.tar.gz -RUN cd /opt \ - && mkdir yarn \ - && tar xzf yarn.tar.gz -C yarn --strip-components 1 \ - && cd /usr/local/bin \ - && ln -s /opt/yarn/bin/yarn - # Composer ENV COMPOSER_HOME /home/developer/.composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer diff --git a/7.1/apache/Dockerfile b/7.1/apache/Dockerfile index 1b3f666..16f909f 100644 --- a/7.1/apache/Dockerfile +++ b/7.1/apache/Dockerfile @@ -27,7 +27,8 @@ ENV TOOLS_PACKAGES \ curl \ git \ openssh-client \ - mysql-client + mysql-client \ + yarn ADD configure.sh /usr/local/bin/configure RUN chmod u+x /usr/local/bin/configure @@ -61,10 +62,7 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ # Special Yarn apt setup RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ -&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ -&& apt-get update \ -&& apt-get install yarn \ -&& rm --recursive --force /var/lib/apt/lists/* +&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list # Extra languages needed for tools RUN apt-get update && apt-get install --yes \ diff --git a/7.1/fpm/Dockerfile b/7.1/fpm/Dockerfile index 3a84ad9..1c51e63 100644 --- a/7.1/fpm/Dockerfile +++ b/7.1/fpm/Dockerfile @@ -27,7 +27,8 @@ ENV TOOLS_PACKAGES \ curl \ git \ openssh-client \ - mysql-client + mysql-client \ + yarn ADD configure.sh /usr/local/bin/configure RUN chmod u+x /usr/local/bin/configure @@ -61,10 +62,7 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ # Special Yarn apt setup RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ -&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ -&& apt-get update \ -&& apt-get install yarn \ -&& rm --recursive --force /var/lib/apt/lists/* +&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list # Extra languages needed for tools RUN apt-get update && apt-get install --yes \ diff --git a/7.1/fpm/alpine/Dockerfile b/7.1/fpm/alpine/Dockerfile index 328555f..187b9e6 100644 --- a/7.1/fpm/alpine/Dockerfile +++ b/7.1/fpm/alpine/Dockerfile @@ -27,7 +27,8 @@ ENV TOOLS_PACKAGES \ curl \ git \ openssh-client \ - mysql-client + mysql-client \ + yarn ADD configure.sh /usr/local/bin/configure RUN chmod u+x /usr/local/bin/configure @@ -79,13 +80,5 @@ RUN set -xe \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ${PHP_EXTENSIONS} \ && apk del .build-deps -# Yarn setup -ADD https://yarnpkg.com/latest.tar.gz /opt/yarn.tar.gz -RUN cd /opt \ - && mkdir yarn \ - && tar xzf yarn.tar.gz -C yarn --strip-components 1 \ - && cd /usr/local/bin \ - && ln -s /opt/yarn/bin/yarn - RUN docker-php-ext-enable \ xdebug diff --git a/base-alpine.Dockerfile b/base-alpine.Dockerfile index 63cf101..c07135d 100644 --- a/base-alpine.Dockerfile +++ b/base-alpine.Dockerfile @@ -41,11 +41,3 @@ RUN set -xe \ && apk del .phpize-deps-configure \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ${PHP_EXTENSIONS} \ && apk del .build-deps - -# Yarn setup -ADD https://yarnpkg.com/latest.tar.gz /opt/yarn.tar.gz -RUN cd /opt \ - && mkdir yarn \ - && tar xzf yarn.tar.gz -C yarn --strip-components 1 \ - && cd /usr/local/bin \ - && ln -s /opt/yarn/bin/yarn diff --git a/base-debian.Dockerfile b/base-debian.Dockerfile index 67dbe67..bf76222 100644 --- a/base-debian.Dockerfile +++ b/base-debian.Dockerfile @@ -24,10 +24,7 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ # Special Yarn apt setup RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ -&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ -&& apt-get update \ -&& apt-get install yarn \ -&& rm --recursive --force /var/lib/apt/lists/* +&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list # Extra languages needed for tools RUN apt-get update && apt-get install --yes \ diff --git a/env.Dockerfile b/env.Dockerfile index 51f3316..319dfb3 100644 --- a/env.Dockerfile +++ b/env.Dockerfile @@ -25,4 +25,5 @@ ENV TOOLS_PACKAGES \ curl \ git \ openssh-client \ - mysql-client + mysql-client \ + yarn