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.

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

Add templates and remove manual Lua install #63

Merged
merged 5 commits into from
Apr 23, 2018

Conversation

yosifkit
Copy link
Member

@yosifkit yosifkit commented Apr 6, 2018

Fixes #61.

1.5 should be materially unchanged. It'll be just the swap to wget and the explicit install of zlib1g-dev which was already assumed to be installed with USE_ZLIB=1 (it is a dependency of libssl-dev in jessie but not stretch).

1.7/Dockerfile Outdated
@@ -21,6 +22,7 @@ RUN set -x \
liblua5.3-dev \
libpcre3-dev \
libssl-dev \
zlib1g-dev \
make \
wget \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:sort? 😇

libssl-dev \
zlib1g-dev \
make \
wget \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the :sort should really happen down here. 😇

update.sh Outdated
travisEnv='\n - VERSION='"$version VARIANT=$variant$travisEnv"
done

if [ "$version" = '1.5' ]; then
for dockerfile in "$version/Dockerfile" "$version/$variant/Dockerfile"; do
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does $variant come from here?

@yosifkit
Copy link
Member Author

🍏 📗 💚 🥗 🇬🇱 green!

@tianon tianon merged commit 8699a1f into docker-library:master Apr 23, 2018
@tianon tianon deleted the lua branch April 23, 2018 23:52
tianon added a commit to infosiftr/stackbrew that referenced this pull request Apr 26, 2018
- `cassandra`: better IP detection (docker-library/cassandra#146)
- `docker`: 18.03.1-ce, 18.05.0-ce-rc1
- `drupal`: 8.5.3, 8.4.8, 7.59
- `ghost`: 1.22.4
- `haproxy`: better Lua install, stretch, Alpine 3.7 (docker-library/haproxy#63)
- `mariadb`: `5.5.60+maria-1~wheezy`
- `matomo`: `latest`
- `mongo`: 3.7.7
- `openjdk`: windows ojdkbuild 1.8.0.171-1
- `percona`: `5.7.21-21-3.jessie`
- `php`: 7.2.5, 7.0.30
- `piwik`: `latest`
- `postgres`: Debian Stretch (docker-library/postgres#437), Alpine 3.7 (docker-library/postgres#436)
- `pypy`: pip 10.0.1 (docker-library/pypy#22)
- `python`: fix Windows build via TLS 1.2 (docker-library/python#279), Python 2 `PYTHONIOENCODING=UTF-8` (docker-library/python#278)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants