Dominik Strässle
|
aede31ea65
|
Parallel composer install in Dockerfile and Dockerfile.fpm fix
|
2020-02-09 18:07:42 +01:00 |
|
Dominik Strässle
|
8f93390a2e
|
Fix breaking docker build
The Dockerfile.apache has been updated recently, but Dockerfile.fpm not. Due to this, the docker build is failing with the following error:
```
configure: error: unrecognized options: --enable-freetype
The command '/bin/sh -c apt-get update && apt-get install -y --no-install-recommends apt-utils && apt-get install -y --no-install-recommends git gosu optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6 libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev mariadb-client && sed -i '/en_US/s/^#//g' /etc/locale.gen && locale-gen && update-locale && docker-php-source extract && docker-php-ext-configure gd --enable-freetype --with-jpeg-dir=/usr/lib/x86_64-linux-gnu/ --with-xpm-dir=/usr/lib/x86_64-linux-gnu/ --with-webp-dir=/usr/lib/x86_64-linux-gnu/ && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl && pecl install imagick && docker-php-ext-enable imagick pcntl imagick gd exif zip curl && curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/bin/composer && echo "${COMPOSER_CHECKSUM} /usr/bin/composer" | sha256sum -c - && chmod 755 /usr/bin/composer && apt-get autoremove --purge -y libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev && rm -rf /var/cache/apt && docker-php-source delete' returned a non-zero code: 1
```
This change updates Dockerfile.fpm to equal the Dockerfile.apache variant. (Except the fpm or apache specific settings)
|
2020-02-09 17:49:12 +01:00 |
|
daniel
|
6350b71cdd
|
Merge pull request #1985 from pixelfed/staging
AP Refactor
|
2020-02-03 20:57:56 -07:00 |
|
Daniel Supernault
|
f6e20b3ec5
|
Update changelog
|
2020-02-02 23:21:27 -07:00 |
|
Daniel Supernault
|
f911c96d16
|
Update lexer autolinker and extractor, add support for mentioned usernames containing dashes, periods and underscore characters
|
2020-02-02 23:20:19 -07:00 |
|
Daniel Supernault
|
f7f16c185e
|
Update AP Helpers, remove unused function
|
2020-02-01 21:08:46 -07:00 |
|
Daniel Supernault
|
823bcbc69a
|
Update AP Helpers
|
2020-02-01 11:42:24 -07:00 |
|
Daniel Supernault
|
764ab76e90
|
Add AP Delivery Service
|
2020-02-01 11:41:19 -07:00 |
|
daniel
|
03505d25a2
|
Merge pull request #1984 from pixelfed/staging
Update Image Util
|
2020-01-31 19:54:00 -07:00 |
|
Daniel Supernault
|
0b7c5d6d37
|
Update Image Util
|
2020-01-31 19:53:33 -07:00 |
|
daniel
|
8f9a79bdb4
|
Merge pull request #1982 from pixelfed/staging
Update Timeline, move announcements from sidebar to top of timeline
|
2020-01-31 19:45:10 -07:00 |
|
Daniel Supernault
|
0e6f4270dd
|
Update compiled assets
|
2020-01-31 19:42:33 -07:00 |
|
Daniel Supernault
|
cbc5eaadf3
|
Update changelog
|
2020-01-31 19:42:13 -07:00 |
|
Daniel Supernault
|
228f504490
|
Update Timeline, move announcements from sidebar to top of timeline
|
2020-01-31 19:40:29 -07:00 |
|
daniel
|
a686289d62
|
Merge pull request #1980 from pixelfed/staging
Update nav, fix link
|
2020-01-30 14:56:10 -07:00 |
|
Daniel Supernault
|
1156cb09d6
|
Update nav, fix link
|
2020-01-30 14:55:45 -07:00 |
|
daniel
|
d6e4be5cb8
|
Merge pull request #1979 from pixelfed/staging
Add MediaFix command
|
2020-01-30 00:22:33 -07:00 |
|
Daniel Supernault
|
a3bd5da226
|
Add MediaFix command
|
2020-01-30 00:21:01 -07:00 |
|
daniel
|
006d95f01f
|
Merge pull request #1978 from pixelfed/staging
Update changelog
|
2020-01-29 23:09:26 -07:00 |
|
Daniel Supernault
|
4789c74a76
|
Update changelog
|
2020-01-29 23:06:08 -07:00 |
|
daniel
|
a7e655d237
|
Merge pull request #1977 from pixelfed/staging
Update status edit view
|
2020-01-29 23:05:59 -07:00 |
|
Daniel Supernault
|
28bc9c1923
|
Update status edit view
|
2020-01-29 23:04:25 -07:00 |
|
Daniel Supernault
|
d366adab7d
|
Update web routes, add rate limits to post edit endpoint
|
2020-01-29 22:08:12 -07:00 |
|
Daniel Supernault
|
51fbfcdcf7
|
Update RateLimit, add max post edits per hour and day
|
2020-01-29 22:07:09 -07:00 |
|
Daniel Supernault
|
ae24433b8c
|
Update StatusController, restrict edits to 24 hours
|
2020-01-29 22:03:34 -07:00 |
|
daniel
|
7798faedc2
|
Merge pull request #1976 from pixelfed/staging
Staging
|
2020-01-29 20:54:34 -07:00 |
|
Daniel Supernault
|
3545937ec7
|
Update changelog
|
2020-01-29 20:54:10 -07:00 |
|
Daniel Supernault
|
e18553ba1c
|
Update changelog
|
2020-01-29 20:53:32 -07:00 |
|
daniel
|
bf8e2663b0
|
Merge pull request #1975 from pixelfed/staging
Bump version to v0.10.8
|
2020-01-29 20:50:26 -07:00 |
|
Daniel Supernault
|
a6765e1a6d
|
Bump version to v0.10.8
|
2020-01-29 20:49:57 -07:00 |
|
daniel
|
ab35ed3547
|
Merge pull request #1973 from pixelfed/staging
Small bugfixes
|
2020-01-29 20:25:07 -07:00 |
|
Daniel Supernault
|
18f8a97a7c
|
Update blade views
|
2020-01-29 19:58:57 -07:00 |
|
Daniel Supernault
|
2071269a71
|
Update changelog
|
2020-01-29 00:14:43 -07:00 |
|
Daniel Supernault
|
eaca43a629
|
Update views with noscript warnings
|
2020-01-29 00:00:09 -07:00 |
|
Daniel Supernault
|
25a7d91b7f
|
Update changelog
|
2020-01-28 23:56:44 -07:00 |
|
Daniel Supernault
|
73249dc239
|
Update nav layout
|
2020-01-28 23:55:57 -07:00 |
|
Daniel Supernault
|
4e2e64b295
|
Update changelog
|
2020-01-28 23:38:29 -07:00 |
|
Daniel Supernault
|
829c41e16f
|
Update password reset ttl, now expires after 24 hours
|
2020-01-28 23:37:08 -07:00 |
|
Daniel Supernault
|
c40cdb6d8a
|
Update FailedJobGC command, change scheduled time to not conflict with daily backups
|
2020-01-28 23:18:12 -07:00 |
|
Daniel Supernault
|
2a64f99a29
|
Update changelog
|
2020-01-28 23:14:42 -07:00 |
|
Daniel Supernault
|
5d424f126a
|
Add FailedJob garbage collection
|
2020-01-28 23:13:27 -07:00 |
|
daniel
|
adb2767b20
|
Merge pull request #1971 from pixelfed/staging
Staging
|
2020-01-28 22:13:21 -07:00 |
|
daniel
|
7e59df4e64
|
Merge pull request #1952 from hellcp/patch-1
Include more and more specific communication methods
|
2020-01-28 22:12:25 -07:00 |
|
daniel
|
c3ad2ce84d
|
Merge pull request #1949 from albjeremias/fix-docker-compose
Fix docker compose
|
2020-01-28 22:11:17 -07:00 |
|
daniel
|
0285fe1f83
|
Merge pull request #1970 from pixelfed/staging
Revert image driver breaking change, will delay
|
2020-01-28 22:09:49 -07:00 |
|
Daniel Supernault
|
5ece86fb0a
|
Revert image driver breaking change, will delay
|
2020-01-28 22:09:17 -07:00 |
|
daniel
|
9eb28f07dc
|
Merge pull request #1969 from pixelfed/staging
Update Story model
|
2020-01-28 21:34:24 -07:00 |
|
Daniel Supernault
|
9f2659da6a
|
Update Story model
|
2020-01-28 21:32:32 -07:00 |
|
Daniel Supernault
|
c5e171c4a8
|
Update image-optimizer config
|
2020-01-28 21:32:09 -07:00 |
|
Daniel Supernault
|
e86ddb94de
|
Update image config
|
2020-01-28 21:31:30 -07:00 |
|