docker/glpi
1
0
Fork 0
Code Issues 2 Pull Requests Actions Projects Releases 9 Wiki Activity

Compare commits

base: docker:0.1.0rc1
Branches Tags
docker:development docker:master
docker:0.7.0 docker:0.6.0 docker:0.5.0 docker:0.4.0 docker:0.3.0 docker:0.2.0 docker:0.1.0 docker:0.1.0rc1 docker:0.1.0rc0 docker:0.0.1
...
compare: docker:0.2.0
Branches Tags
docker:development docker:master
docker:0.7.0 docker:0.6.0 docker:0.5.0 docker:0.4.0 docker:0.3.0 docker:0.2.0 docker:0.1.0 docker:0.1.0rc1 docker:0.1.0rc0 docker:0.0.1

14 Commits
0.1.0rc1 ... 0.2.0

Author SHA1 Message Date
nfc_bot
b998feb289 build(version): bump version 0.1.0 → 0.2.0 2023-10-28 07:51:52 +00:00
Jon
483511129e Merge branch 'glpi-version-bump' into 'development' 
feat(glpi): Bumped to version 10.0.10

See merge request nofusscomputing/projects/docker-glpi!7
 2023-10-28 07:11:12 +00:00
Jon
a50e33cbc9 feat(glpi): Bumped to version 10.0.10 
!7
 2023-10-28 16:21:03 +09:30
No Fuss Computing Bot
67ac817446 Merge branch 'automated-tasks' into 'development' 
chore(gitlab-ci): Automated update of git sub-module

See merge request nofusscomputing/projects/docker-glpi!6
 2023-10-28 05:13:37 +00:00
nfc_bot
ee9935b81b chore(git): updated submodule gitlab-ci 
Automation Data:
{
    "branch": "development",
    "current_commit": "a5a9fa44374107657b2587ce52607d96a825be56)",
    "name": "gitlab-ci",
    "path": "/builds/nofusscomputing/projects/docker-glpi/_automation_/gitlab-ci",
    "remote_head": "52f4ebda54f5932e66cf37ac8783b0b49fcf01fa)",
    "remote_name": "origin",
    "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git"
}

Changes: Submodule path gitlab-ci: checked out 52f4ebda54f5932e66cf37ac8783b0b49fcf01fa

MR !6
 2023-10-28 05:12:56 +00:00
No Fuss Computing Bot
d849408117 Merge branch 'automated-tasks' into 'development' 
chore(gitlab-ci): Automated update of git sub-module

See merge request nofusscomputing/projects/docker-glpi!5
 2023-09-02 06:05:29 +00:00
nfc_bot
3fa39b5b32 chore(git): updated submodule gitlab-ci 
Automation Data:
{
    "branch": "development",
    "current_commit": "975de7aca210667d1e93d02a4036ca4ae70808ff)",
    "name": "gitlab-ci",
    "path": "/builds/nofusscomputing/projects/docker-glpi/_automation_/gitlab-ci",
    "remote_head": "a5a9fa44374107657b2587ce52607d96a825be56)",
    "remote_name": "origin",
    "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git"
}

Changes: Submodule path gitlab-ci: checked out a5a9fa44374107657b2587ce52607d96a825be56

MR !5
 2023-09-02 06:04:51 +00:00
nfc_bot
1ae3a0aabe build(version): bump version 0.1.0rc1 → 0.1.0 2023-08-30 04:02:15 +00:00
Jon
9b0f8e3360 Merge branch 'issues-work' into 'development' 
chore: work on issues

Closes #3

See merge request nofusscomputing/projects/docker-glpi!4
 2023-08-30 03:19:41 +00:00
Jon
44e31c1deb build(docs): publish to website 
!4
 2023-08-30 12:23:03 +09:30
Jon
6278fbb3dc feat(php): upgrade php to 8.1 
listed as the highest supported version
3fc65ad276/README.md (prerequisites)

!4 closes #3
 2023-08-30 12:05:37 +09:30
Jon
688517556a fix(dockerfile): ensure CA certs available prior to apt install 
!4
 2023-08-30 11:56:25 +09:30
Jon
5884c49f8a fix(dockerfile): silently fail if file doesn't exist on delete 
!4 #3
 2023-08-30 11:55:19 +09:30
Jon
1973f5e003 refactor(docker): dockerfile move php version to arg 
!4 #3
 2023-08-30 11:22:23 +09:30
5 changed files with 78 additions and 27 deletions
Expand all files Collapse all files

2
.cz.yaml
View File

@ -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.2.0

22
.gitlab-ci.yml
View File

@ -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

21
CHANGELOG.md
View File

@ -1,3 +1,24 @@
## 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
View File

@ -1,11 +1,13 @@
ARG GLPI_VERSION=10.0.9
ARG GLPI_VERSION=10.0.10
ARG VERSION_PHP=8.1
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

2
gitlab-ci

Submodule gitlab-ci updated: 975de7aca2...52f4ebda54