Update: Dockerfile
This commit is contained in:
parent
809f05e45e
commit
a928c99804
29
Dockerfile
29
Dockerfile
@ -4,7 +4,6 @@ ARG BRANCH=25.x
|
|||||||
ARG UID=1000
|
ARG UID=1000
|
||||||
ARG GID=1000
|
ARG GID=1000
|
||||||
ARG PHP_VERSION=7.4
|
ARG PHP_VERSION=7.4
|
||||||
ARG PHP_VERSION=
|
|
||||||
|
|
||||||
RUN apt update && apt dist-upgrade -y
|
RUN apt update && apt dist-upgrade -y
|
||||||
|
|
||||||
@ -20,18 +19,17 @@ RUN apt install -y \
|
|||||||
RUN apt install -y r-base r-base-dev r-recommended imagemagick ffmpeg python3 \
|
RUN apt install -y r-base r-base-dev r-recommended imagemagick ffmpeg python3 \
|
||||||
mariadb-client unoconv
|
mariadb-client unoconv
|
||||||
|
|
||||||
RUN apt remove -y php-cli && apt install -y php${PHP_VERSION}-cli
|
RUN apt remove -y php-cli && \
|
||||||
|
apt install -y php${PHP_VERSION}-cli
|
||||||
|
|
||||||
RUN apt install -y \
|
RUN apt update -y && apt install -y \
|
||||||
php${PHP_VERSION}-dom php${PHP_VERSION}-gd php${PHP_VERSION}-curl php${PHP_VERSION}-intl php${PHP_VERSION}-zip php${PHP_VERSION}-bcmath \
|
php${PHP_VERSION}-gd php${PHP_VERSION}-curl php${PHP_VERSION}-intl php${PHP_VERSION}-zip php${PHP_VERSION}-bcmath \
|
||||||
sqlite3 php${PHP_VERSION}-sqlite3 build-essential elinks unzip xlsx2csv psutils \
|
sqlite3 php${PHP_VERSION}-sqlite3 build-essential elinks unzip xlsx2csv psutils
|
||||||
php${PHP_VERSION}-memcached php${PHP_VERSION}-memcached php${PHP_VERSION}-opcache php${PHP_VERSION}-intl php${PHP_VERSION}-gd \
|
RUN apt install -y php${PHP_VERSION}-memcached php${PHP_VERSION}-memcached php${PHP_VERSION}-intl php${PHP_VERSION}-gd \
|
||||||
php${PHP_VERSION}-mysql php${PHP_VERSION}-ldap php${PHP_VERSION}-dom php${PHP_VERSION}-zip php${PHP_VERSION}-ldap \
|
php${PHP_VERSION}-mysql php${PHP_VERSION}-ldap php${PHP_VERSION}-zip \
|
||||||
php${PHP_VERSION}-fpm php${PHP_VERSION}-mysql php${PHP_VERSION}-mbstring php${PHP_VERSION}-bz2 \
|
php${PHP_VERSION}-fpm php${PHP_VERSION}-mysql php${PHP_VERSION}-mbstring php${PHP_VERSION}-bz2 php-dompdf php${PHP_VERSION}-xml php${PHP_VERSION}-redis \
|
||||||
php-dompdf \
|
|
||||||
composer curl
|
composer curl
|
||||||
|
|
||||||
#RUN update-alternatives --install /usr/bin/php php /usr/bin/php${PHP_VERSION} 99 --force
|
|
||||||
|
|
||||||
RUN ln -s /usr/bin/python3 /usr/bin/python
|
RUN ln -s /usr/bin/python3 /usr/bin/python
|
||||||
|
|
||||||
@ -56,11 +54,20 @@ RUN adduser www-data tikiwiki
|
|||||||
|
|
||||||
WORKDIR /var/www/html/tiki
|
WORKDIR /var/www/html/tiki
|
||||||
|
|
||||||
|
RUN update-alternatives --install /usr/bin/php php /usr/bin/php${PHP_VERSION} 99 --force
|
||||||
|
RUN update-alternatives --set php /usr/bin/php${PHP_VERSION}
|
||||||
|
|
||||||
USER tikiwiki
|
USER tikiwiki
|
||||||
|
|
||||||
RUN git clone -b ${BRANCH} https://gitlab.com/tikiwiki/tiki.git .
|
RUN git clone -b ${BRANCH} https://gitlab.com/tikiwiki/tiki.git .
|
||||||
|
|
||||||
RUN bash setup.sh -n composer
|
# Solucion temporal ( para 26.x )
|
||||||
|
COPY packages/* vendor_custom/
|
||||||
|
RUN cd vendor_custom && \
|
||||||
|
find . -name "*.zip" | while read filename; do unzip $filename; done;
|
||||||
|
RUN cd vendor_custom && rm -rf *.zip
|
||||||
|
|
||||||
|
RUN sh setup.sh -n composer
|
||||||
|
|
||||||
ADD entrypoint.sh /entrypoint.sh
|
ADD entrypoint.sh /entrypoint.sh
|
||||||
|
|
||||||
|
@ -38,6 +38,7 @@ update() {
|
|||||||
sudo -u tikiwiki php console.php database:update
|
sudo -u tikiwiki php console.php database:update
|
||||||
sudo -u tikiwiki php console.php package:update
|
sudo -u tikiwiki php console.php package:update
|
||||||
sudo -u tikiwiki php console.php installer:lock
|
sudo -u tikiwiki php console.php installer:lock
|
||||||
|
install_packages
|
||||||
}
|
}
|
||||||
|
|
||||||
[ -s ./db/local.php ] && update || install
|
[ -s ./db/local.php ] && update || install
|
||||||
|
BIN
packages/tiki-pkg-casperjs-dev-master.zip
Normal file
BIN
packages/tiki-pkg-casperjs-dev-master.zip
Normal file
Binary file not shown.
BIN
packages/tiki-pkg-dexie-2.0.4.zip
Normal file
BIN
packages/tiki-pkg-dexie-2.0.4.zip
Normal file
Binary file not shown.
BIN
packages/tiki-pkg-expose-3.0.zip
Normal file
BIN
packages/tiki-pkg-expose-3.0.zip
Normal file
Binary file not shown.
BIN
packages/tiki-pkg-fakerphp-v1.20.0.zip
Normal file
BIN
packages/tiki-pkg-fakerphp-v1.20.0.zip
Normal file
Binary file not shown.
BIN
packages/tiki-pkg-fullcalendarscheduler-5.11.5.zip
Normal file
BIN
packages/tiki-pkg-fullcalendarscheduler-5.11.5.zip
Normal file
Binary file not shown.
BIN
packages/tiki-pkg-lozad-1.16.0.zip
Normal file
BIN
packages/tiki-pkg-lozad-1.16.0.zip
Normal file
Binary file not shown.
BIN
packages/tiki-pkg-mediaalchemyst-0.5.6.zip
Normal file
BIN
packages/tiki-pkg-mediaalchemyst-0.5.6.zip
Normal file
Binary file not shown.
BIN
packages/tiki-pkg-tikimanager-dev-master.zip
Normal file
BIN
packages/tiki-pkg-tikimanager-dev-master.zip
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user