build(version): bump version 0.1.0rc1 → 0.1.0

Merge branch 'issues-work' into 'development'
chore: work on issues Closes #3 See merge request nofusscomputing/projects/docker-glpi!4
2023-08-30 04:02:15 +00:00 · 2023-08-30 03:19:41 +00:00 · 2023-08-30 12:23:03 +09:30 · 2023-08-30 12:05:37 +09:30 · 2023-08-30 11:56:25 +09:30 · 2023-08-30 11:55:19 +09:30
4 changed files with 70 additions and 25 deletions
--- a/.cz.yaml
+++ b/.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.1.0
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,18 @@
+## 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
--- a/56
+++ b/56
@ -1,11 +1,13 @@
 ARG GLPI_VERSION=10.0.9
+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
Author	SHA1	Message	Date
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