Skip to content

ONBUILD support #8

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

Merged
tianon merged 3 commits into from
Sep 8, 2014
Merged

ONBUILD support #8

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
660bda5
Add `-onbuild` variants
tianon Sep 8, 2014
5f83271
Add simple update.sh script
tianon Sep 8, 2014
080b343
Update generate-stackbrew-library.sh to include onbuild tags
tianon Sep 8, 2014
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
9 changes: 9 additions & 0 deletions 2/onbuild/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM python:2.7.8

RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app

ONBUILD COPY requirements.txt /usr/src/app/
ONBUILD RUN pip install -r requirements.txt

ONBUILD COPY . /usr/src/app
9 changes: 9 additions & 0 deletions 3/onbuild/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM python:3.4.1

RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app

ONBUILD COPY requirements.txt /usr/src/app/
ONBUILD RUN pip install -r requirements.txt

ONBUILD COPY . /usr/src/app
15 changes: 14 additions & 1 deletion generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

versions=( */ )
versions=( "${versions[@]%/}" )
url='git://github.com/docker-library/docker-python'
url='git://github.com/docker-library/python'

echo '# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)'

Expand All @@ -24,4 +24,17 @@ for version in "${versions[@]}"; do
for va in "${versionAliases[@]}"; do
echo "$va: ${url}@${commit} $version"
done

for variant in onbuild; do
commit="$(git log -1 --format='format:%H' "$version/$variant")"
echo
for va in "${versionAliases[@]}"; do
if [ "$va" = 'latest' ]; then
va="$variant"
else
va="$va-$variant"
fi
echo "$va: ${url}@${commit} $version/$variant"
done
done
done
19 changes: 19 additions & 0 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash
set -e

cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

versions=( "$@" )
if [ ${#versions[@]} -eq 0 ]; then
versions=( */ )
fi
versions=( "${versions[@]%/}" )

for version in "${versions[@]}"; do
fullVersion="$(curl -sSL 'https://www.python.org/ftp/python/' | grep '<a href="'"$version." | sed -r 's!.*<a href="([^"/]+)/?".*!\1!' | sort -V | tail -1)"
(
set -x
sed -ri 's/^(ENV PYTHON_VERSION) .*/\1 '"$fullVersion"'/' "$version/Dockerfile"
sed -ri 's/^(FROM python):.*/\1:'"$fullVersion"'/' "$version/onbuild/Dockerfile"
)
done