This repository has been archived by the owner on Oct 6, 2021. It is now read-only.
Update Dockerfile to Ubuntu 17.10 and PHP 7.2 #194
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Made base image Ubuntu 17.10 - Changed packages to install for PHP 7.2 - Removed libsodium install stuff (now in 7.2 core) - Removed redundant apt installs of composer (2nd was a NOP) - Removed installs of git and wget (not used anymore) - Removed install of php-dev - Reason: don't need to compile sodium and the number of deps it wasted time installing was ridiculous - Removed redundant call to a2enmod rewrite - Change apache run command arg to -DFOREGROUND - In testing, -D FOREGROUND still resulted in apache exiting
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This DOES NOT change the web server to Caddy, as was suggested in #60. My hope is that this is at least a marginal (but useful!) improvement that makes the docker-compose setup useful until I or someone else can get the caddy install stuff worked into the build process.
deps it wasted time installing was ridiculous
One concern I have is that I see the Travis file still installs libsodium and php7.2-sodium. The
sodiumextension was showing as installed by default and libsodium appeared to be getting fetched from ondrej's PPA during the image build process. So I'm not sure if I'm missing something or if it's just a difference in environment that accounts for the differences in configuration.Issues Addressed (Optional)
#171
Contributor Agreement (Required)
I am submitting this pull request under one or more of the following
licenses:
Furthermore, I understand that CMS Airship is released under the GNU Public
License to the general public, as well as private commercial licenses
(purchasable from Paragon Initiative Enterprises).
By submitting this pull request, I acknowledge that my contribution will be
incorporated into CMS Airship, and consent for it to be handled as outlined
above.
(This does not in any way restrict your rights to use your own modifications.
The purpose of this agreement is to maximize awareness and transparency.)
Labels Requested
Feel free to list any labels you feel are appropriate for this issue,
and a member of the Airship core team will apply them as soon as
possible.
Dockerenhancement