Commit Graph

5057 Commits (0fabac50e3ac4ed9090f8de43e47e46a90fbd01c)
 

Author SHA1 Message Date
Shlee c241184a70
Update pixelfed.php 5 years ago
Shlee 2a82788ab0
Update Installer.php 5 years ago
Shlee a5117fcfa3
Update Installer.php 5 years ago
Shlee b16d2dbefb
Update passwords.php 5 years ago
Shlee 6b1e90c5d4
Update passwords.php 5 years ago
Daniel Supernault c78bdadb8a
Update changelog 5 years ago
Daniel Supernault dd5fa3a49d
Update PlaceController, fixes #2017 5 years ago
Daniel Supernault f400c632f0
Update DeleteAccountPipeline, fixes #2016 5 years ago
Shlee 06d2fd3027
Update moment.scss 5 years ago
Shlee 9dd1e5fb55
Update custom.scss 5 years ago
Shlee b4cb75a314
Update custom.scss 5 years ago
Shlee 03c90fd4de
Update pixelfed.php 5 years ago
Shlee b9a66fed95
Update Installer.php 5 years ago
Daniel Supernault a68e1a42ed
Update changelog 5 years ago
Daniel Supernault b04c7170d7
Update DiscoverController, fixes #2009 5 years ago
Daniel Supernault e313f2735b
Update self-diagnosis command 5 years ago
Daniel Supernault b796bcc7a7
Update changelog 5 years ago
Daniel Supernault 03f808c744
Update self-diagnosis checks 5 years ago
Daniel Supernault ebbbb4f9e6
Update mail blade views, fix markdown bug 5 years ago
Daniel Supernault 923dbcb660
Update changelog 5 years ago
Daniel Supernault cbc63b048e
Update mail panel blade view, fix markdown bug 5 years ago
Shlee 06d60ac351
Update ProfileTransformer.php 5 years ago
Shlee b629e4fd90
Update routes.php 5 years ago
Shlee 77bc605417
Update pixelfed.php 5 years ago
Shlee 438138b55c
Update instance.php 5 years ago
Shlee 03de0761ab
Update exp.php 5 years ago
Shlee 44c5494a0c
Update pixelfed.php 5 years ago
Shlee 2295bef877
Update pixelfed.php 5 years ago
Shlee 524d4370d2
Update media.php 5 years ago
Shlee 10211fe9cb
Update media.php 5 years ago
Shlee 76fd1c1efd
Update media.php 5 years ago
Shlee f56c175b09
Update .env.testing 5 years ago
Shlee 9f1ca2cbc8
Update .env.example.docker 5 years ago
Shlee b43c464fd3
Update .env.example 5 years ago
Daniel Supernault 5eb11f435d
Update app layout 5 years ago
Daniel Supernault 382857ee94
Update app layout 5 years ago
Daniel Supernault e0ab73c102
CS fix 5 years ago
Daniel Supernault a34f38633c
Update Profile model, add reported relationship 5 years ago
daniel e33fb88f71
Merge pull request #2000 from Johnny-Malizia/ffmpeg
Updated Dockerfiles to include ffmpeg
5 years ago
daniel 310de84599
Merge pull request #2002 from pixelfed/staging
Staging
5 years ago
Johnny Malizia 3ba77206b5 Updated Dockerfiles to include ffmpeg 5 years ago
Daniel Supernault 157379cb0e
Update compiled assets 5 years ago
Daniel Supernault aa6d8c8f85
Update PostComponent.vue, fix MomentUI caption 5 years ago
daniel c076e9a7b6 Merge pull request #1996 from dominikstraessle/patch-1
Fix breaking docker build & Optimize docker build time
5 years ago
daniel 3207536d5c Merge pull request #1995 from svalo/translation-it-updates
Updates italian translation and uniforms indentation
5 years ago
daniel a87c236c00 Merge pull request #1989 from pixelfed/staging
Bug fixes
5 years ago
Dominik Strässle cf5fc9c556 Fix invalid copy command 5 years ago
Dominik Strässle aede31ea65 Parallel composer install in Dockerfile and Dockerfile.fpm fix 5 years ago
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)
5 years ago
valo 4e4ae88c79 Updates italian translation and uniforms indentation 5 years ago