ソースを参照

fix: Sync Dockerfiles and templates

master
Bingen Eguzkitza 3ヶ月前
コミット
1c6a794002
4個のファイルの変更16行の追加4行の削除
  1. +1
    -1
      images/email/Dockerfile
  2. +4
    -0
      images/haproxy/Dockerfile
  3. +8
    -3
      images/mariadb/Dockerfile.template
  4. +3
    -0
      images/nextcloud/Dockerfile.template

+ 1
- 1
images/email/Dockerfile ファイルの表示

@@ -8,7 +8,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q --fix-missing && \
apt-get -y install --no-install-recommends \
rsyslog \
postfix postfix-pcre postfix-ldap \
sudo cron getmail4 \
cron getmail4 \
mutt swaks \
dovecot-core dovecot-imapd dovecot-pop3d dovecot-lmtpd dovecot-ldap \
libsasl2-2 sasl2-bin libsasl2-modules-ldap

+ 4
- 0
images/haproxy/Dockerfile ファイルの表示

@@ -1,5 +1,9 @@
FROM debian:buster

#RUN echo deb http://deb.debian.org/debian jessie-backports main >> /etc/apt/sources.list
#RUN apt-get update && apt-get install -y haproxy cron \
# && apt-get install -y certbot -t jessie-backports

RUN apt-get update && apt-get install -y haproxy cron certbot

RUN mkdir -p /run/haproxy

+ 8
- 3
images/mariadb/Dockerfile.template ファイルの表示

@@ -13,9 +13,14 @@ RUN \
apt-get -y install mariadb-server procps

RUN find /etc/mysql/ -name *.cnf -exec sed -i 's/^\(bind-address\s.*\)/# \1/' {} \;

# Install Mysql DB
RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
#RUN \
# find /etc/mysql/ -name *.cnf -exec sed -i 's/^\(bind-address\s.*\)/# \1/' {} \; && \
# echo "mysqld_safe &" > /tmp/config && \
# echo "mysqladmin --silent --wait=30 ping || exit 1" >> /tmp/config && \
# echo "mysql -e 'GRANT ALL PRIVILEGES ON *.* TO \"root\"@\"%\" WITH GRANT OPTION;'" >> /tmp/config && \
# bash /tmp/config && \
# mysql -e "SELECT Host, User, Password FROM mysql.user;" > /tmp/a.out
#rm -f /tmp/config

COPY tuning.cnf /etc/mysql/conf.d/tuning.cnf


+ 3
- 0
images/nextcloud/Dockerfile.template ファイルの表示

@@ -32,6 +32,9 @@ RUN cat /tmp/php_nc.ini >> /etc/php/7.4/fpm/php.ini && \
cat /tmp/php_nc.ini >> /etc/php/7.4/cli/php.ini
# https://docs.nextcloud.com/server/13/admin_manual/installation/source_installation.html#php-fpm-tips-label
RUN sed -i 's/^;env/env/g' /etc/php/7.4/fpm/pool.d/www.conf
# https://github.com/nextcloud/vm/issues/2039#issuecomment-876204446
RUN echo "" >> /etc/php/7.4/mods-available/apcu.ini
RUN echo "apc.enable_cli=1" >> /etc/php/7.4/mods-available/apcu.ini

# Create the data-directory where NEXTCLOUD can store its stuff
RUN mkdir -p "${NEXTCLOUD_DATA_PATH}" && \

読み込み中…
キャンセル
保存