Compare commits
28 Commits
Author | SHA1 | Date | |
---|---|---|---|
89fa6cf4b5 | |||
0f9b203815 | |||
043d3e83de | |||
0b746d7ee8 | |||
dffc70141f | |||
4820e30d55 | |||
f424c3f806 | |||
646a605bc4 | |||
4f9e2e75df | |||
8b39ca13f6 | |||
153141874f | |||
098f43b611 | |||
33561c8665 | |||
9e605a0bbc | |||
b998feb289 | |||
483511129e | |||
a50e33cbc9 | |||
67ac817446 | |||
ee9935b81b | |||
d849408117 | |||
3fa39b5b32 | |||
1ae3a0aabe | |||
9b0f8e3360 | |||
44e31c1deb | |||
6278fbb3dc | |||
688517556a | |||
5884c49f8a | |||
1973f5e003 |
2
.cz.yaml
2
.cz.yaml
@ -4,4 +4,4 @@ commitizen:
|
||||
name: cz_conventional_commits
|
||||
tag_format: $major.$minor.$patch$prerelease
|
||||
update_changelog_on_bump: true
|
||||
version: 0.1.0rc1
|
||||
version: 0.4.0
|
||||
|
@ -15,3 +15,25 @@ include:
|
||||
file:
|
||||
- template/automagic.gitlab-ci.yaml
|
||||
#- template: Jobs/Container-Scanning.gitlab-ci.yml # see https://gitlab.com/gitlab-org/gitlab/-/issues/381665
|
||||
|
||||
|
||||
Website.Submodule.Deploy:
|
||||
extends: .submodule_update_trigger
|
||||
variables:
|
||||
SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/infrastructure/website
|
||||
environment:
|
||||
url: https://nofusscomputing.com/$PAGES_ENVIRONMENT_PATH
|
||||
name: Documentation
|
||||
rules:
|
||||
- if: # condition_dev_branch_push
|
||||
$CI_COMMIT_BRANCH == "development" &&
|
||||
$CI_PIPELINE_SOURCE == "push"
|
||||
exists:
|
||||
- '{docs/**,pages/**}/*.md'
|
||||
changes:
|
||||
paths:
|
||||
- '{docs/**,pages/**}/*.md'
|
||||
compare_to: 'master'
|
||||
when: always
|
||||
|
||||
- when: never
|
||||
|
34
CHANGELOG.md
34
CHANGELOG.md
@ -1,3 +1,37 @@
|
||||
## 0.4.0 (2024-02-01)
|
||||
|
||||
### Features
|
||||
|
||||
- [0f9b2038](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/0f9b203815e69156fbbd538edf19cf7f22654e4d) - Bump GLPI version to 10.0.12 [ [!13](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/13) ]
|
||||
|
||||
## 0.3.0 (2024-01-09)
|
||||
|
||||
### Features
|
||||
|
||||
- **php**: [dffc7014](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/dffc70141f46cf7f719aa928bd76aa4e55b67a0d) - Bumped to version 8.2 [ [!13](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/13) ]
|
||||
- **glpi**: [4820e30d](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/4820e30d551d904d4781e503ca2c8adb7a336fbd) - Bumped to version 10.0.11 [ [!13](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/13) ]
|
||||
|
||||
## 0.2.0 (2023-10-28)
|
||||
|
||||
### Features
|
||||
|
||||
- **glpi**: [a50e33cb](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/a50e33cbc96b2d6791f8ae288e1beea88a459f38) - Bumped to version 10.0.10 [ [!7](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/7) ]
|
||||
|
||||
## 0.1.0 (2023-08-30)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- **dockerfile**: [68851755](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/688517556a748c2ac74d657d573b4ee79a1e48d3) - ensure CA certs available prior to apt install [ [!4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/4) ]
|
||||
- **dockerfile**: [5884c49f](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/5884c49f8aacfc25e5b79e1fe1edb745891b9c85) - silently fail if file doesn't exist on delete [ [!4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/4) [#3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/3) ]
|
||||
|
||||
### Code Refactor
|
||||
|
||||
- **docker**: [1973f5e0](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/1973f5e00358be11e2c82ea0fdfb0f32430fa0b6) - dockerfile move php version to arg [ [!4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/4) [#3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/3) ]
|
||||
|
||||
### Features
|
||||
|
||||
- **php**: [6278fbb3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/6278fbb3dce77dc01dedcb4cefa91b428eaa9135) - upgrade php to 8.1 [ [!4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/4) [#3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/3) ]
|
||||
|
||||
## 0.1.0rc1 (2023-08-30)
|
||||
|
||||
### Bug Fixes
|
||||
|
58
dockerfile
58
dockerfile
@ -1,11 +1,13 @@
|
||||
ARG GLPI_VERSION=10.0.9
|
||||
ARG GLPI_VERSION=10.0.12
|
||||
ARG VERSION_PHP=8.2
|
||||
|
||||
FROM debian:bullseye-slim as prepare
|
||||
|
||||
ARG GLPI_VERSION
|
||||
ARG VERSION_PHP
|
||||
|
||||
ENV GLPI_VERSION $GLPI_VERSION
|
||||
|
||||
ENV VERSION_PHP $VERSION_PHP
|
||||
# RUN echo "Acquire::http::Proxy \"http://192.168.1.172:3142\";\nAcquire::https::Proxy \"http://192.168.1.172:3142\";" > /etc/apt/apt.conf.d/apt_proxy.conf
|
||||
|
||||
|
||||
@ -35,15 +37,17 @@ FROM debian:bullseye-slim
|
||||
|
||||
|
||||
ARG GLPI_VERSION
|
||||
ARG VERSION_PHP
|
||||
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
||||
ENV GLPI_VERSION $GLPI_VERSION
|
||||
|
||||
|
||||
ENV VERSION_PHP $VERSION_PHP
|
||||
|
||||
#COPY --from=prepare /etc/apt/apt.conf.d/apt_proxy.conf /etc/apt/apt.conf.d/apt_proxy.conf
|
||||
|
||||
|
||||
COPY --from=prepare /usr/share/keyrings/deb.sury.org-php.gpg /usr/share/keyrings/deb.sury.org-php.gpg
|
||||
|
||||
COPY --from=prepare /etc/apt/sources.list.d/php.list /etc/apt/sources.list.d/php.list
|
||||
@ -51,29 +55,33 @@ COPY --from=prepare /etc/apt/sources.list.d/php.list /etc/apt/sources.list.d/php
|
||||
|
||||
RUN apt update; \
|
||||
apt install --no-install-recommends -y \
|
||||
apache2 \
|
||||
php7.4 \
|
||||
php7.4-mysql \
|
||||
php7.4-ldap \
|
||||
php7.4-xmlrpc \
|
||||
php7.4-imap \
|
||||
php7.4-curl \
|
||||
php7.4-gd \
|
||||
php7.4-mbstring \
|
||||
php7.4-xml \
|
||||
php-cas \
|
||||
php7.4-intl \
|
||||
php7.4-zip \
|
||||
php7.4-bz2 \
|
||||
php7.4-redis \
|
||||
ca-certificates \
|
||||
\
|
||||
cron \
|
||||
supervisor \
|
||||
ca-certificates; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
rm -rf /var/www/html; \
|
||||
rm /etc/apt/apt.conf.d/apt_proxy.conf; \
|
||||
a2enmod rewrite;
|
||||
supervisor; \
|
||||
rm -rf /var/lib/apt/lists/*;
|
||||
|
||||
RUN apt update; \
|
||||
apt install --no-install-recommends -y \
|
||||
apache2 \
|
||||
php$VERSION_PHP \
|
||||
php$VERSION_PHP-mysql \
|
||||
php$VERSION_PHP-ldap \
|
||||
php$VERSION_PHP-xmlrpc \
|
||||
php$VERSION_PHP-imap \
|
||||
php$VERSION_PHP-curl \
|
||||
php$VERSION_PHP-gd \
|
||||
php$VERSION_PHP-mbstring \
|
||||
php$VERSION_PHP-xml \
|
||||
php-cas \
|
||||
php$VERSION_PHP-intl \
|
||||
php$VERSION_PHP-zip \
|
||||
php$VERSION_PHP-bz2 \
|
||||
php$VERSION_PHP-redis; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
rm -rf /var/www/html; \
|
||||
rm -f /etc/apt/apt.conf.d/apt_proxy.conf; \
|
||||
a2enmod rewrite;
|
||||
|
||||
|
||||
COPY --from=prepare /tmp/glpi /var/www/html
|
||||
|
Submodule gitlab-ci updated: 975de7aca2...bd22ff566c
Reference in New Issue
Block a user