Skip to content

Commit

Permalink
Sync from khs1994-docker/lnmp@add8e63 by PCIT
Browse files Browse the repository at this point in the history
  • Loading branch information
khs1994 committed Feb 10, 2024
1 parent 028327c commit 4f6d5c0
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
16 changes: 8 additions & 8 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ steps:
# install dep
- name: install
# image: composer:2.5.8
image: khs1994/php:8.2.5-composer-alpine
image: khs1994/php:8.2.10-composer-alpine
commands:
- pwd
- composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/
Expand All @@ -46,7 +46,7 @@ steps:

# test script
- name: script
image: khs1994/php:8.2.5-fpm-alpine
image: khs1994/php:8.2.10-fpm-alpine
# pull: always | never | if-not-exists
# detach: true
# privileged: true
Expand Down Expand Up @@ -92,7 +92,7 @@ steps:
settings:
# registry: docker.khs1994.com
repo: khs1994/php
tags: 8.2.5-pro-${DRONE_TAG}-alpine
tags: 8.2.10-pro-${DRONE_TAG}-alpine
target: php
mirror: https://hub-mirror.c.163.com
# build_args:
Expand Down Expand Up @@ -142,7 +142,7 @@ steps:
image: plugins/docker
settings:
repo: khs1994/php
tags: 8.2.5-pro-${DRONE_TAG}-alpine
tags: 8.2.10-pro-${DRONE_TAG}-alpine
target: php
mirror: https://hub-mirror.c.163.com
username:
Expand Down Expand Up @@ -179,7 +179,7 @@ steps:
event: [ tag ]

- name: after_success
image: khs1994/php:8.2.5-composer-alpine
image: khs1994/php:8.2.10-composer-alpine
when:
status: success
commands:
Expand Down Expand Up @@ -228,9 +228,9 @@ volumes:
# COMPOSER_VERSION:
# - 2.5.8
# PHP_VERSION:
# - 8.2.5
# - 8.1.15
# - 8.0.28
# - 8.2.10
# - 8.1.23
# - 8.0.30
# # - 7.4.33
# # - 7.3.33
# # - 7.2.34
Expand Down
6 changes: 3 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
DOCKER_HUB_USERNAME=khs1994

PHP_VERSION=8.2.5
# PHP_VERSION=8.1.15
# PHP_VERSION=8.0.28
PHP_VERSION=8.2.10
# PHP_VERSION=8.1.23
# PHP_VERSION=8.0.30
# PHP_VERSION=7.4.33
# PHP_VERSION=7.3.33
# PHP_VERSION=7.2.34
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
test:
strategy:
matrix:
php_version: ["8.0.28","8.1.15","8.2.5"]
php_version: ["8.0.30","8.1.23","8.2.10"]
runs-on: ubuntu-latest
# needs: job
steps:
Expand Down
10 changes: 5 additions & 5 deletions .pcit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ steps:
# install dep
install:
# image: composer:${COMPOSER_VERSION}
image: khs1994/php:8.2.5-composer-alpine
image: khs1994/php:8.2.10-composer-alpine
shell: bash
run:
- pwd
Expand Down Expand Up @@ -80,7 +80,7 @@ steps:
event: tag

after_success:
image: khs1994/php:8.2.5-composer-alpine
image: khs1994/php:8.2.10-composer-alpine
shell: bash
if:
status: success
Expand Down Expand Up @@ -129,9 +129,9 @@ jobs:
COMPOSER_VERSION:
- 2.5.8
PHP_VERSION:
- 8.2.5
- 8.1.15
- 8.0.28
- 8.2.10
- 8.1.23
- 8.0.30
# - 7.4.33
# - 7.3.33
# - 7.2.34
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# !! 搜索 /app/EXAMPLE 替换为自己的项目目录 !!

ARG NODE_VERSION=20.5.1
ARG PHP_VERSION=8.2.5
ARG PHP_VERSION=8.2.10
ARG NGINX_VERSION=1.15.0
ARG DOCKER_HUB_USERNAME=khs1994

Expand All @@ -28,7 +28,7 @@ RUN cd /app \
--no-plugins

# 2.将项目打入 PHP 镜像
# $ docker build -t khs1994/php:8.2.5-pro-GIT_TAG-alpine --target=php .
# $ docker build -t khs1994/php:8.2.10-pro-GIT_TAG-alpine --target=php .

FROM ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION}-fpm-alpine as php

Expand Down
2 changes: 1 addition & 1 deletion deploy/test.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# TEST PHP PROJECT BY Docker
#

ARG PHP_VERSION=8.2.5
ARG PHP_VERSION=8.2.10
ARG GIT_REPO={{ EXAMPLE_GIT_URL_EXAMPLE }}/{{ EXAMPLE_GIT_USERNAME_EXAMPLE }}/{{ EXAMPLE_GIT_REPO_EXAMPLE }}.git

FROM khs1994/php:${PHP_VERSION}-composer-alpine
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
context: .
dockerfile: deploy/test.Dockerfile
args:
- PHP_VERSION=${PHP_VERSION:-8.2.5}
- PHP_VERSION=${PHP_VERSION:-8.2.10}
image: ${DOCKER_HUB_USERNAME:-khs1994}/EXAMPLE

nginx:
Expand All @@ -39,7 +39,7 @@ services:
dockerfile: Dockerfile
target: php
args:
- PHP_VERSION=${PHP_VERSION:-8.2.5}
- PHP_VERSION=${PHP_VERSION:-8.2.10}
- NODE_VERSION=${NODE_VERSION:-20.5.1}
- NODE_REGISTRY=https://registry.npmmirror.com
image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.5}-pro-alpine
image: ${DOCKER_HUB_USERNAME:-khs1994}/php:${PHP_VERSION:-8.2.10}-pro-alpine
4 changes: 2 additions & 2 deletions docker-workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ x-common:
services:
workspace:
&workspace
image: khs1994/php:8.2.5-composer-alpine
image: khs1994/php:8.2.10-composer-alpine
networks:
- backend
volumes:
Expand Down Expand Up @@ -67,7 +67,7 @@ services:
<< :
- *workspace
- *common
image: "khs1994/php:8.2.5-composer-alpine"
image: "khs1994/php:8.2.10-composer-alpine"
command: [] # install | update

npm:
Expand Down

0 comments on commit 4f6d5c0

Please sign in to comment.