Skip to content

install php7-session #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heiderich wants to merge 6 commits into
base: master
Choose a base branch
from
Open

install php7-session #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf8f583
install php7-session
heiderich Jun 7, 2020
c7074e4
pin awl to r0.62 and davical to r1.1.10
heiderich Apr 4, 2022
f0383cf
copy config files to / instead of /config
heiderich Apr 4, 2022
ba59637
-p for mkdir
heiderich Apr 4, 2022
774c1c3
spacing
heiderich Apr 4, 2022
7988209
adopt path of davical.php
heiderich Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ COPY initialize_db.sh /sbin/initialize_db.sh
COPY backup_db.sh /sbin/backup_db.sh
COPY docker-entrypoint.sh /sbin/docker-entrypoint.sh
COPY restore_db.sh /sbin/restore_db.sh
COPY apache.conf /config/apache.conf
COPY davical.php /config/davical.php
COPY supervisord.conf /config/supervisord.conf
COPY rsyslog.conf /config/rsyslog.conf
COPY apache.conf /apache.conf
COPY davical.php /davical.php
COPY supervisord.conf /supervisord.conf
COPY rsyslog.conf /rsyslog.conf

# apk
RUN apk --update add \
Expand All @@ -47,14 +47,15 @@ RUN apk --update add \
php7-pdo \
php7-pdo_pgsql \
php7-calendar \
php7-session \
perl \
perl-yaml \
perl-dbd-pg \
perl-dbi \
git \
# git
&& git clone https://gitlab.com/davical-project/awl.git /usr/share/awl/ \
&& git clone https://gitlab.com/davical-project/davical.git /usr/share/davical/ \
&& git clone --depth 1 --branch r0.62 https://gitlab.com/davical-project/awl.git /usr/share/awl/ \
&& git clone --depth 1 --branch r1.1.10 https://gitlab.com/davical-project/davical.git /usr/share/davical/ \
&& rm -rf /usr/share/davical/.git /usr/share/awl/.git/ \
&& apk del git \
# Apache
Expand All @@ -80,24 +81,24 @@ RUN apk --update add \
&& sed -i /ErrorLog/s/^/#/ /etc/apache2/conf.d/ssl.conf \
&& sed -i /TransferLog/s/^/#/ /etc/apache2/conf.d/ssl.conf \
# permissions for shell scripts and config files
&& chmod 0755 /sbin/initialize_db.sh \
&& chmod 0755 /sbin/initialize_db.sh \
&& chmod 0755 /sbin/backup_db.sh \
&& chmod 0755 /sbin/docker-entrypoint.sh \
&& chmod 0755 /sbin/restore_db.sh \
&& mkdir /etc/davical /etc/supervisor.d/ /etc/rsyslog.d \
&& echo -e "\$IncludeConfig /etc/rsyslog.d/*.conf" > /etc/rsyslog.conf \
&& chown -R root:apache /etc/davical \
&& chmod -R u=rwx,g=rx,o= /etc/davical \
&& chown root:apache /config/davical.php \
&& chmod u+rwx,g+rx /config/davical.php \
&& ln -s /config/apache.conf /etc/apache2/conf.d/davical.conf \
&& chown root:apache /davical.php \
&& chmod u+rwx,g+rx /davical.php \
&& ln -s /config/apache.conf /etc/apache2/conf.d/davical.conf \
&& ln -s /config/davical.php /etc/davical/config.php \
&& ln -s /sbin/backup_db.sh /etc/periodic/daily/backup \
&& ln -s /config/supervisord.conf /etc/supervisor.d/supervisord.ini \
&& ln -s /config/rsyslog.conf /etc/rsyslog.d/rsyslog-davical.conf \
# clean-up etc
&& rm -rf /var/cache/apk/* \
&& mkdir -p /run/apache2 \
&& mkdir -p /run/apache2 \
&& mkdir /run/postgresql \
&& chmod a+w /run/postgresql

Expand Down
2 changes: 1 addition & 1 deletion docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ echo $TIME_ZONE > /etc/timezone
apk del tzdata

#PREPARE THE PERMISSIONS FOR VOLUMES
mkdir /config
mkdir -p /config
chown -R root:root /config
chmod -R 755 /config
mv -n /apache.conf /config/apache.conf
Expand Down