diff --git a/Dockerfile b/Dockerfile deleted file mode 100755 index 907b353f5..000000000 --- a/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM php:8.2.1RC1-apache - -ARG DB_HOST=mysql -ARG DB_USER=librebooking -ARG DB_PASSWORD -ARG DB_DATABASE=librebooking -ARG LB_ENV=production -ARG EMBED_MYSQL=true -ARG INSTALL_PASSWORD=install -ARG SCRIPT_URL=http://localhost:8080/ -ARG ADMIN_EMAIL=admin@example.com - -ENV DB_HOST=$DB_HOST -ENV DB_USER=$DB_USER -ENV DB_PASSWORD=$DB_PASSWORD -ENV DB_DATABASE=$DB_DATABASE -ENV LB_ENV=$LB_ENV -ENV EMBED_MYSQL=$EMBED_MYSQL -ENV INSTALL_PASSWORD=$INSTALL_PASSWORD -ENV SCRIPT_URL=$SCRIPT_URL -ENV ADMIN_EMAIL=$ADMIN_EMAIL - -RUN mkdir /var/www/librebooking/ -COPY . /var/www/librebooking/ -COPY entrypoint.sh / -RUN sed -i "s#DocumentRoot /var/www/html#DocumentRoot /var/www/librebooking#" /etc/apache2/sites-enabled/000-default.conf -RUN a2enmod rewrite -RUN docker-php-ext-install mysqli - -WORKDIR /var/www/librebooking -RUN mkdir -p tpl_c tpl uploads -RUN chown -R www-data:www-data tpl_c tpl uploads - -CMD /entrypoint.sh diff --git a/README.md b/README.md index 46cf10f20..a0d8700d7 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,11 @@ Please consult the wiki for more help 09/03/2023 - The ReCaptcha integration has been updated to v3, you will need to generate new keys for your website if you are using it on your website. +## Docker usage + +For information on how to use LibreBooking in a Docker container see: + + ## Release Notes #### 2.8.6.1 - 2023-09-26 diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100755 index 5f4493b86..000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,41 +0,0 @@ -version: '3.4' - -services: - - mariadb: - image: mariadb - restart: always - ports: - - 3306:3306 - #volumes: - # - /var/lib/mysql:/var/lib/mysql - environment: - - MARIADB_DATABASE=librebooking - - MARIADB_USER=librebooking - - MARIADB_PASSWORD=password - - MARIADB_ROOT_PASSWORD=rootpass - networks: - - librebooking - - lb: - # image: limosek/librebooking # In production, uncomment this and remove the next line to use the stable release - build: . - user: 1000:1001 # Use your own UID:GID for development. In production, remove this line. - restart: always - depends_on: - - mariadb - ports: - - 8080:80 - environment: - - DB_USER=librebooking - - DB_DATABASE=librebooking - - DB_PASSWORD=password - - DB_HOST=mariadb - - LB_ENV=dev # In production, remove this line - networks: - - librebooking - volumes: # In production, remove this and the next line - - .:/var/www/librebooking - -networks: - librebooking: diff --git a/docker/.gitignore b/docker/.gitignore deleted file mode 100644 index ce4a85e5a..000000000 --- a/docker/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/* -/*/ - -!.gitignore -!/Dockerfile -!/docker-compose.yml -!/README.md \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index f0d90075e..000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM php:8.1-apache - -WORKDIR "/var/www/html" - -ARG DEBIAN_FRONTEND=noninteractive - -RUN apt-get update && apt-get install -y \ - libfreetype6-dev \ - libjpeg62-turbo-dev \ - libpng-dev \ - && docker-php-ext-configure gd --with-freetype --with-jpeg \ - && docker-php-ext-install -j$(nproc) gd gettext mysqli pdo_mysql - -RUN pecl install xdebug \ - && docker-php-ext-enable xdebug - -RUN a2enmod rewrite -RUN a2enmod headers \ No newline at end of file diff --git a/docker/README.md b/docker/README.md index d117ab42a..b66f9e5b3 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,9 +1,4 @@ # Docker Deployment -:bulb: Perform the steps described in [`doc/INSTALLATION.md`](../doc/INSTALLATION.md). - -1. Adapt the [`./config/config.php`](../config/config.php) to your needs -2. Adapt the [`docker-compose.yml`](./docker-compose.yml) file to your needs and change passwords. -3. Run the deployment using `docker-compose up -d` from this folder. - -Thanks to @olivierbicler for the template. +Please see https://github.com/LibreBooking/docker for information on using +LibreBooking with Docker. diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml deleted file mode 100644 index 638a9d7c8..000000000 --- a/docker/docker-compose.yml +++ /dev/null @@ -1,30 +0,0 @@ -version: "3.1" -services: - mysql: - image: mysql:5.7 - container_name: booked-database - volumes: - - ./mysql:/var/lib/mysql - environment: - - MYSQL_DATABASE=bookedscheduler - - MYSQL_ROOT_PASSWORD=myrootpassword - - MYSQL_USER=booked_user - - MYSQL_PASSWORD=mypassword - networks: - - booked-network - - server: - build: . - image: booked-server:v1 - container_name: booked-server - ports: - - "8080:80" - volumes: - - ../:/var/www/html - # - ./php.ini:/usr/local/etc/php/conf.d/99-overrides.ini - networks: - - booked-network - -networks: - booked-network: - driver: bridge