Skip to content

Commit

Permalink
Release 0.9.1 with PHP 8.0
Browse files Browse the repository at this point in the history
Relates to #52
  • Loading branch information
ckulka committed Jan 15, 2022
1 parent e26cada commit e96d4b9
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion apache.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ADD https://github.com/sabre-io/Baikal/releases/download/$VERSION/baikal-$VERSIO
RUN apk add unzip && unzip -q baikal-$VERSION.zip

# Final Docker image
FROM php:8.1-apache
FROM php:8.0-apache

LABEL description="Baikal is a Cal and CardDAV server, based on sabre/dav, that includes an administrative interface for easy management."
LABEL version="0.9.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-compose.custom-storage-location.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Docker Compose file for a Baikal server

version: '2'
version: "2"
services:
baikal:
image: ckulka/baikal:nginx
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-compose.localvolumes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# chown -R 101:101 config Specific <- Use this for Nginx
# chown -R 33:33 config Specific <- Use this for Apache httpd

version: '2'
version: "2"
services:
baikal:
image: ckulka/baikal:nginx
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Docker Compose file for a Baikal server

version: '2'
version: "2"
services:
baikal:
image: ckulka/baikal:nginx
Expand Down
18 changes: 9 additions & 9 deletions nginx.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ RUN curl -o /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
apt remove -y lsb-release &&\
apt update &&\
apt install -y \
php8.1-curl \
php8.1-fpm \
php8.1-mbstring \
php8.1-mysql \
php8.1-sqlite3 \
php8.1-xml \
php8.0-curl \
php8.0-fpm \
php8.0-mbstring \
php8.0-mysql \
php8.0-sqlite3 \
php8.0-xml \
sqlite3 \
sendmail &&\
rm -rf /var/lib/apt/lists/* &&\
sed -i 's/www-data/nginx/' /etc/php/8.1/fpm/pool.d/www.conf &&\
sed -i 's/^listen = .*/listen = \/var\/run\/php-fpm.sock/' /etc/php/8.1/fpm/pool.d/www.conf
sed -i 's/www-data/nginx/' /etc/php/8.0/fpm/pool.d/www.conf &&\
sed -i 's/^listen = .*/listen = \/var\/run\/php-fpm.sock/' /etc/php/8.0/fpm/pool.d/www.conf

# Add Baikal & nginx configuration
COPY --from=builder baikal /var/www/baikal
Expand All @@ -41,4 +41,4 @@ COPY files/nginx.conf /etc/nginx/conf.d/default.conf

VOLUME /var/www/baikal/config
VOLUME /var/www/baikal/Specific
CMD /etc/init.d/php8.1-fpm start && chown -R nginx:nginx /var/www/baikal/Specific && nginx -g "daemon off;"
CMD /etc/init.d/php8.0-fpm start && chown -R nginx:nginx /var/www/baikal/Specific && nginx -g "daemon off;"

0 comments on commit e96d4b9

Please sign in to comment.