Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Git to get composer git cache #25

Merged
merged 3 commits into from
Jan 30, 2018
Merged

Upgrade Git to get composer git cache #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2566764
Add backports package repository.
marvil07 Jan 19, 2018
db99c9e
Use git from jessie-backports to get composer git cache.
marvil07 Jan 20, 2018
f838183
Fix dockerfile command and indentation error.
marvil07 Jan 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion 5.6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ ENV LC_ALL C.UTF-8
# Enable additional repos
RUN set -xe; \
sed -i 's/main/main contrib non-free/' /etc/apt/sources.list; \
# Include backports
echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/backports.list; \
# Include blackfire.io repo
curl -sSL https://packagecloud.io/gpg.key | apt-key add -; \
echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list; \
Expand All @@ -52,7 +54,6 @@ RUN set -xe; \
RUN set -xe; \
apt-get update >/dev/null; apt-get -y --force-yes --no-install-recommends install >/dev/null \
dnsutils \
git \
git-lfs \
ghostscript \
# html2text binary - used for self-testing (php-fpm)
Expand All @@ -76,6 +77,8 @@ RUN set -xe; \
zsh \
yarn \
;\
# More recent version of git to get composer's git cache.
apt-get -y --force-yes --no-install-recommends -t jessie-backports install git >/dev/null ;\
# Cleanup
apt-get clean; rm -rf /var/lib/apt/lists/*

Expand Down
5 changes: 4 additions & 1 deletion 7.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ ENV LC_ALL C.UTF-8
# Enable additional repos
RUN set -xe; \
sed -i 's/main/main contrib non-free/' /etc/apt/sources.list; \
# Include backports
echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/backports.list; \
# Include blackfire.io repo
curl -sSL https://packagecloud.io/gpg.key | apt-key add -; \
echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list; \
Expand All @@ -52,7 +54,6 @@ RUN set -xe; \
RUN set -xe; \
apt-get update >/dev/null; apt-get -y --force-yes --no-install-recommends install >/dev/null \
dnsutils \
git \
git-lfs \
ghostscript \
# html2text binary - used for self-testing (php-fpm)
Expand All @@ -76,6 +77,8 @@ RUN set -xe; \
zsh \
yarn \
;\
# More recent version of git to get composer's git cache.
apt-get -y --force-yes --no-install-recommends -t jessie-backports install git >/dev/null ;\
# Cleanup
apt-get clean; rm -rf /var/lib/apt/lists/*

Expand Down
5 changes: 4 additions & 1 deletion 7.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ ENV LC_ALL C.UTF-8
# Enable additional repos
RUN set -xe; \
sed -i 's/main/main contrib non-free/' /etc/apt/sources.list; \
# Include backports
echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/backports.list; \
# Include blackfire.io repo
curl -sSL https://packagecloud.io/gpg.key | apt-key add -; \
echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list; \
Expand All @@ -52,7 +54,6 @@ RUN set -xe; \
RUN set -xe; \
apt-get update >/dev/null; apt-get -y --force-yes --no-install-recommends install >/dev/null \
dnsutils \
git \
git-lfs \
ghostscript \
# html2text binary - used for self-testing (php-fpm)
Expand All @@ -76,6 +77,8 @@ RUN set -xe; \
zsh \
yarn \
;\
# More recent version of git to get composer's git cache.
apt-get -y --force-yes --no-install-recommends -t jessie-backports install git >/dev/null ;\
# Cleanup
apt-get clean; rm -rf /var/lib/apt/lists/*

Expand Down
5 changes: 4 additions & 1 deletion 7.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ ENV LC_ALL C.UTF-8
# Enable additional repos
RUN set -xe; \
sed -i 's/main/main contrib non-free/' /etc/apt/sources.list; \
# Include backports
echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/backports.list; \
# Include blackfire.io repo
curl -sSL https://packagecloud.io/gpg.key | apt-key add -; \
echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list; \
Expand All @@ -53,7 +55,6 @@ RUN set -xe; \
RUN set -xe; \
apt-get update >/dev/null; apt-get -y --force-yes --no-install-recommends install >/dev/null \
dnsutils \
git \
git-lfs \
ghostscript \
# html2text binary - used for self-testing (php-fpm)
Expand All @@ -77,6 +78,8 @@ RUN set -xe; \
zsh \
yarn \
;\
# More recent version of git to get composer's git cache.
apt-get -y --force-yes --no-install-recommends -t jessie-backports install git >/dev/null ;\
# Cleanup
apt-get clean; rm -rf /var/lib/apt/lists/*

Expand Down