mirror of
https://github.com/DiouxX/docker-glpi.git
synced 2026-11-07 15:32:33 -05:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d4d1a0d1b | ||
|
|
f5fd511cfa | ||
|
|
c1171a1847 |
No files matched your search
@@ -1,23 +0,0 @@
|
|||||||
name: Build & Publish Dev Docker image
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- "dev"
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
docker:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Login to DockerHub
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
|
|
||||||
|
|
||||||
- name: Build and push
|
|
||||||
uses: docker/build-push-action@v5.3.0
|
|
||||||
with:
|
|
||||||
push: true
|
|
||||||
tags: diouxx/glpi:dev
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
name: Build & Publish Docker Image
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
docker:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Set output
|
|
||||||
id: vars
|
|
||||||
run: echo ::set-output name=tag::$
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v1
|
|
||||||
- name: Login to DockerHub
|
|
||||||
uses: docker/login-action@v1
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
|
|
||||||
- name: Build and push
|
|
||||||
id: docker_build
|
|
||||||
uses: docker/build-push-action@v2
|
|
||||||
with:
|
|
||||||
push: true
|
|
||||||
tags: diouxx/glpi:latest
|
|
||||||
+14
-15
@@ -7,7 +7,7 @@ LABEL org.opencontainers.image.authors="github@diouxx.be"
|
|||||||
#Ne pas poser de question à l'installation
|
#Ne pas poser de question à l'installation
|
||||||
ENV DEBIAN_FRONTEND noninteractive
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
|
|
||||||
#Installation d'apache et de php8.3 avec extension
|
#Installation d'apache et de php7.4 avec extension
|
||||||
RUN apt update \
|
RUN apt update \
|
||||||
&& apt install --yes ca-certificates apt-transport-https lsb-release wget curl \
|
&& apt install --yes ca-certificates apt-transport-https lsb-release wget curl \
|
||||||
&& curl -sSLo /usr/share/keyrings/deb.sury.org-php.gpg https://packages.sury.org/php/apt.gpg \
|
&& curl -sSLo /usr/share/keyrings/deb.sury.org-php.gpg https://packages.sury.org/php/apt.gpg \
|
||||||
@@ -15,21 +15,20 @@ RUN apt update \
|
|||||||
&& apt update \
|
&& apt update \
|
||||||
&& apt install --yes --no-install-recommends \
|
&& apt install --yes --no-install-recommends \
|
||||||
apache2 \
|
apache2 \
|
||||||
php8.3 \
|
php7.4 \
|
||||||
php8.3-mysql \
|
php7.4-mysql \
|
||||||
php8.3-bcmath \
|
php7.4-ldap \
|
||||||
php8.3-ldap \
|
php7.4-xmlrpc \
|
||||||
php8.3-xmlrpc \
|
php7.4-imap \
|
||||||
php8.3-imap \
|
php7.4-curl \
|
||||||
php8.3-curl \
|
php7.4-gd \
|
||||||
php8.3-gd \
|
php7.4-mbstring \
|
||||||
php8.3-mbstring \
|
php7.4-xml \
|
||||||
php8.3-xml \
|
|
||||||
php-cas \
|
php-cas \
|
||||||
php8.3-intl \
|
php7.4-intl \
|
||||||
php8.3-zip \
|
php7.4-zip \
|
||||||
php8.3-bz2 \
|
php7.4-bz2 \
|
||||||
php8.3-redis \
|
php7.4-redis \
|
||||||
cron \
|
cron \
|
||||||
jq \
|
jq \
|
||||||
libldap-2.5-0 \
|
libldap-2.5-0 \
|
||||||
|
|||||||
+3
-3
@@ -6,12 +6,12 @@
|
|||||||
|
|
||||||
if [[ -z "${TIMEZONE}" ]]; then echo "TIMEZONE is unset";
|
if [[ -z "${TIMEZONE}" ]]; then echo "TIMEZONE is unset";
|
||||||
else
|
else
|
||||||
echo "date.timezone = \"$TIMEZONE\"" > /etc/php/8.3/apache2/conf.d/timezone.ini;
|
echo "date.timezone = \"$TIMEZONE\"" > /etc/php/7.4/apache2/conf.d/timezone.ini;
|
||||||
echo "date.timezone = \"$TIMEZONE\"" > /etc/php/8.3/cli/conf.d/timezone.ini;
|
echo "date.timezone = \"$TIMEZONE\"" > /etc/php/7.4/cli/conf.d/timezone.ini;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#Enable session.cookie_httponly
|
#Enable session.cookie_httponly
|
||||||
sed -i 's,session.cookie_httponly = *\(on\|off\|true\|false\|0\|1\)\?,session.cookie_httponly = on,gi' /etc/php/8.3/apache2/php.ini
|
sed -i 's,session.cookie_httponly = *\(on\|off\|true\|false\|0\|1\)\?,session.cookie_httponly = on,gi' /etc/php/7.4/apache2/php.ini
|
||||||
|
|
||||||
FOLDER_GLPI=glpi/
|
FOLDER_GLPI=glpi/
|
||||||
FOLDER_WEB=/var/www/html/
|
FOLDER_WEB=/var/www/html/
|
||||||
|
|||||||
Reference in new issue
Block a user