-
-
Notifications
You must be signed in to change notification settings - Fork 44
feat: added support for Podman as container engine #2548
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
Open
Linsner
wants to merge
2
commits into
keymanapp:master
Choose a base branch
from
Linsner:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+42
−0
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| # Treat SVGs like images, and not like text. | ||
| *.svg binary | ||
| Dockerfile text eol=lf | ||
| Podmanfile text eol=lf | ||
| *.sh eol=lf |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| # syntax=docker/dockerfile:1 | ||
|
|
||
| ARG BUILDER_CONFIGURATION="release" | ||
| FROM docker.io/library/php:7.4-apache@sha256:c9d7e608f73832673479770d66aacc8100011ec751d1905ff63fae3fe2e0ca6d AS composer-builder | ||
|
|
||
| # Install Zip to use composer | ||
| RUN apt-get update && apt-get install -y \ | ||
| zlib1g-dev \ | ||
| libzip-dev \ | ||
| unzip | ||
| RUN docker-php-ext-install zip | ||
|
|
||
| # Install and update composer | ||
| COPY --from=docker.io/library/composer /usr/bin/composer /usr/bin/composer | ||
| RUN composer self-update | ||
|
|
||
| WORKDIR /composer | ||
| COPY composer.* /composer/ | ||
| # Consume the build argment | ||
| ARG BUILDER_CONFIGURATION | ||
| RUN if [ "$BUILDER_CONFIGURATION" = "debug" ]; then \ | ||
| # composer install --dev deprecated | ||
| COMPOSER_NO_DEV=0 composer install ; \ | ||
| else \ | ||
| COMPOSER_NO_DEV=1 composer install ; \ | ||
| fi | ||
|
|
||
| USER www-data | ||
|
Linsner marked this conversation as resolved.
Outdated
|
||
|
|
||
| # Site | ||
| FROM docker.io/library/php:7.4-apache@sha256:c9d7e608f73832673479770d66aacc8100011ec751d1905ff63fae3fe2e0ca6d | ||
| COPY resources/keyman-site.conf /etc/apache2/conf-available/ | ||
| RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini | ||
| RUN chown -R www-data:www-data /var/www/html/ | ||
|
|
||
| COPY --from=composer-builder /composer/vendor /var/www/vendor | ||
| RUN a2enmod rewrite headers; a2enconf keyman-site | ||
|
|
||
| # RUN echo LogLevel alert rewrite:trace6 >> /etc/apache2/apache2.conf | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.