Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

10.0.16 #71

Merged
merged 3 commits into from
Jul 5, 2024
Merged

10.0.16 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4905e1
Upgrade to 10.0.16
eduardofraga Jul 5, 2024
58361fb
Update php and nginx
eduardofraga Jul 5, 2024
8b549d2
update readme
eduardofraga Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish-nginx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
REGISTRY: "docker.io"
# github.repository as <account>/<repo>
IMAGE_NAME: ${{ github.repository }}
# VERSION: "10.0.15"
# VERSION: "10.0.16"

jobs:
build-nginx:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish-php-fpm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
REGISTRY: "docker.io"
# github.repository as <account>/<repo>
IMAGE_NAME: ${{ github.repository }}
# VERSION: "10.0.15"
# VERSION: "10.0.16"

jobs:
build-php-fpm:
Expand Down
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://stand-with-ukraine.pp.ua)

[![PHP](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-php-fpm.yml/badge.svg?branch=10.0.15)](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-php-fpm.yml)
[![Nginx](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-nginx.yml/badge.svg?branch=10.0.15)](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-nginx.yml)
[![PHP](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-php-fpm.yml/badge.svg?branch=10.0.16)](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-php-fpm.yml)
[![Nginx](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-nginx.yml/badge.svg?branch=10.0.16)](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-nginx.yml)

![GLPI Logo](https://raw.githubusercontent.com/glpi-project/glpi/master/pics/logos/logo-GLPI-250-black.png)

Expand All @@ -11,10 +11,10 @@
Manifest files for build and deploy the **GLPI** as Containers with Docker using docker-compose or Kubernetes.

In this versio we have deployment containers with:
- [x] php:8.3.6-fpm-alpine3.19;
- [x] nginx:1.25.4-alpine3.18;
- [x] eftechcombr/glpi:php-fpm-10.0.15;
- [x] eftechcombr/glpi:nginx-10.0.15.
- [x] php:8.3.8-fpm-alpine3.20;
- [x] nginx:1.27.0-alpine3.19-slim;
- [x] eftechcombr/glpi:php-fpm-10.0.16;
- [x] eftechcombr/glpi:nginx-10.0.16.

## Credentials

Expand Down
2 changes: 1 addition & 1 deletion docker/_env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GLPI_LANG="en_US"
VERSION="10.0.15"
VERSION="10.0.16"
GLPI_MARKETPLACE_DIR=/var/www/html/marketplace
GLPI_VAR_DIR=/var/lib/glpi
GLPI_DOC_DIR=/var/lib/glpi
Expand Down
10 changes: 5 additions & 5 deletions docker/docker-compose-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
command: mysql -h $MARIADB_HOST -u root -p$MARIADB_ROOT_PASSWORD -e "GRANT SELECT ON \`mysql\`.\`time_zone_name\` TO 'glpi'@'%'; FLUSH PRIVILEGES; FLUSH PRIVILEGES;"

glpi-db-install:
image: eftechcombr/glpi:php-fpm-10.0.15
image: eftechcombr/glpi:php-fpm-10.0.16
restart: on-failure
env_file: ./.env
volumes:
Expand All @@ -30,7 +30,7 @@ services:
- /usr/local/bin/glpi-db-install.sh

glpi-verify-dir:
image: eftechcombr/glpi:php-fpm-10.0.15
image: eftechcombr/glpi:php-fpm-10.0.16
restart: on-failure
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -43,7 +43,7 @@ services:
- /usr/local/bin/glpi-verify-dir.sh

glpi-db-configure:
image: eftechcombr/glpi:php-fpm-10.0.15
image: eftechcombr/glpi:php-fpm-10.0.16
restart: on-failure
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -57,7 +57,7 @@ services:

php:
build: php/
image: eftechcombr/glpi:php-fpm-10.0.15
image: eftechcombr/glpi:php-fpm-10.0.16
restart: unless-stopped
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -74,7 +74,7 @@ services:

nginx:
build: nginx/
image: eftechcombr/glpi:nginx-10.0.15
image: eftechcombr/glpi:nginx-10.0.16
restart: unless-stopped
ports:
- "8080:80"
Expand Down
10 changes: 5 additions & 5 deletions docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
command: mysql -h $MARIADB_HOST -u root -p$MARIADB_ROOT_PASSWORD -e "GRANT SELECT ON \`mysql\`.\`time_zone_name\` TO 'glpi'@'%'; FLUSH PRIVILEGES; FLUSH PRIVILEGES;"

glpi-db-install:
image: eftechcombr/glpi:php-fpm-10.0.15
image: eftechcombr/glpi:php-fpm-10.0.16
restart: on-failure
env_file: ./.env
volumes:
Expand All @@ -30,7 +30,7 @@ services:
- /usr/local/bin/glpi-db-install.sh

glpi-verify-dir:
image: eftechcombr/glpi:php-fpm-10.0.15
image: eftechcombr/glpi:php-fpm-10.0.16
restart: on-failure
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -43,7 +43,7 @@ services:
- /usr/local/bin/glpi-verify-dir.sh

glpi-db-configure:
image: eftechcombr/glpi:php-fpm-10.0.15
image: eftechcombr/glpi:php-fpm-10.0.16
restart: on-failure
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -56,7 +56,7 @@ services:
- /usr/local/bin/glpi-db-configure.sh

php:
image: eftechcombr/glpi:php-fpm-10.0.15
image: eftechcombr/glpi:php-fpm-10.0.16
restart: unless-stopped
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -72,7 +72,7 @@ services:
- "9000:9000"

nginx:
image: eftechcombr/glpi:nginx-10.0.15
image: eftechcombr/glpi:nginx-10.0.16
restart: unless-stopped
ports:
- "8080:80"
Expand Down
4 changes: 2 additions & 2 deletions docker/nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM eftechcombr/glpi:php-fpm-10.0.15 as BUILD
FROM eftechcombr/glpi:php-fpm-10.0.16 as BUILD
#

FROM nginx:1.25.4-alpine3.18
FROM nginx:1.27.0-alpine3.19-slim
#
COPY --from=BUILD /var/www/html /var/www/html
COPY --from=BUILD /var/lib/glpi /var/lib/glpi
Expand Down
4 changes: 2 additions & 2 deletions docker/php/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM php:8.3.6-fpm-alpine3.19
FROM php:8.3.8-fpm-alpine3.20

ENV VERSION 10.0.15
ENV VERSION 10.0.16
ENV GLPI_LANG en_US
ENV MARIADB_HOST mariadb-glpi
ENV MARIADB_PORT 3306
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/glpi-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: glpi
data:
GLPI_LANG: "en_US"
VERSION: "10.0.15"
VERSION: "10.0.16"
GLPI_MARKETPLACE_DIR: /var/www/html/marketplace
GLPI_VAR_DIR: /var/lib/glpi
GLPI_DOC_DIR: /var/lib/glpi
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/glpi-cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
template:
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.15
- image: eftechcombr/glpi:php-fpm-10.0.16
imagePullPolicy: Always
name: base
envFrom:
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/glpi-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
app: php-fpm
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.15
- image: eftechcombr/glpi:php-fpm-10.0.16
imagePullPolicy: Always
name: php
envFrom:
Expand Down Expand Up @@ -67,7 +67,7 @@ spec:
app: nginx
spec:
containers:
- image: eftechcombr/glpi:nginx-10.0.15
- image: eftechcombr/glpi:nginx-10.0.16
imagePullPolicy: Always
name: nginx
envFrom:
Expand Down
8 changes: 4 additions & 4 deletions kubernetes/glpi-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
template:
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.15
- image: eftechcombr/glpi:php-fpm-10.0.16
imagePullPolicy: Always
name: base
envFrom:
Expand Down Expand Up @@ -53,7 +53,7 @@ spec:
template:
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.15
- image: eftechcombr/glpi:php-fpm-10.0.16
imagePullPolicy: Always
name: base
command:
Expand Down Expand Up @@ -97,7 +97,7 @@ spec:
template:
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.15
- image: eftechcombr/glpi:php-fpm-10.0.16
imagePullPolicy: Always
name: base
command:
Expand Down Expand Up @@ -141,7 +141,7 @@ spec:
template:
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.15
- image: eftechcombr/glpi:php-fpm-10.0.16
imagePullPolicy: Always
name: base
command:
Expand Down