Skip to content

Commit 3180610

Browse files
authored
Merge branch 'master' into dockerize
2 parents c96bb79 + 58a4622 commit 3180610

File tree

11 files changed

+13
-13
lines changed

11 files changed

+13
-13
lines changed

.github/workflows/ci-cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
version: ['8.0', '8.1', '8.2', '8.3', '8.4']
15+
version: ['8.1', '8.2', '8.3', '8.4']
1616
type: ['', '-prod']
1717

1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v4.2.2
20+
uses: actions/checkout@v5.0.0
2121

2222
- name: Setup QEMU
2323
uses: docker/setup-qemu-action@v3

.github/workflows/docker-description.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
docker-description:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4.2.2
15+
- uses: actions/checkout@v5.0.0
1616

1717
- name: Sync Docker Hub Description
18-
uses: peter-evans/dockerhub-description@v4.0.0
18+
uses: peter-evans/dockerhub-description@v5.0.0
1919
env:
2020
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
2121
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}

8.1-nginx-prod/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
4040
&& mkdir -p /etc/nginx/conf.d \
4141
&& mkdir /etc/nginx/h5bp \
4242
&& cd /etc/nginx/h5bp \
43-
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \
43+
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \
4444
&& tar xzvf h5bp.tgz \
4545
&& rm -f h5bp.tgz \
4646
&& mv server-configs-nginx-*/h5bp/* . \

8.1-nginx/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
4040
&& mkdir -p /etc/nginx/conf.d \
4141
&& mkdir /etc/nginx/h5bp \
4242
&& cd /etc/nginx/h5bp \
43-
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \
43+
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \
4444
&& tar xzvf h5bp.tgz \
4545
&& rm -f h5bp.tgz \
4646
&& mv server-configs-nginx-*/h5bp/* . \

8.2-nginx-prod/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
4040
&& mkdir -p /etc/nginx/conf.d \
4141
&& mkdir /etc/nginx/h5bp \
4242
&& cd /etc/nginx/h5bp \
43-
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \
43+
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \
4444
&& tar xzvf h5bp.tgz \
4545
&& rm -f h5bp.tgz \
4646
&& mv server-configs-nginx-*/h5bp/* . \

8.2-nginx/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
4040
&& mkdir -p /etc/nginx/conf.d \
4141
&& mkdir /etc/nginx/h5bp \
4242
&& cd /etc/nginx/h5bp \
43-
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \
43+
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \
4444
&& tar xzvf h5bp.tgz \
4545
&& rm -f h5bp.tgz \
4646
&& mv server-configs-nginx-*/h5bp/* . \

8.3-nginx-prod/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
4040
&& mkdir -p /etc/nginx/conf.d \
4141
&& mkdir /etc/nginx/h5bp \
4242
&& cd /etc/nginx/h5bp \
43-
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \
43+
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \
4444
&& tar xzvf h5bp.tgz \
4545
&& rm -f h5bp.tgz \
4646
&& mv server-configs-nginx-*/h5bp/* . \

8.3-nginx/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
4040
&& mkdir -p /etc/nginx/conf.d \
4141
&& mkdir /etc/nginx/h5bp \
4242
&& cd /etc/nginx/h5bp \
43-
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \
43+
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \
4444
&& tar xzvf h5bp.tgz \
4545
&& rm -f h5bp.tgz \
4646
&& mv server-configs-nginx-*/h5bp/* . \

8.4-nginx-prod/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
4040
&& mkdir -p /etc/nginx/conf.d \
4141
&& mkdir /etc/nginx/h5bp \
4242
&& cd /etc/nginx/h5bp \
43-
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \
43+
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \
4444
&& tar xzvf h5bp.tgz \
4545
&& rm -f h5bp.tgz \
4646
&& mv server-configs-nginx-*/h5bp/* . \

8.4-nginx/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
4040
&& mkdir -p /etc/nginx/conf.d \
4141
&& mkdir /etc/nginx/h5bp \
4242
&& cd /etc/nginx/h5bp \
43-
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \
43+
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \
4444
&& tar xzvf h5bp.tgz \
4545
&& rm -f h5bp.tgz \
4646
&& mv server-configs-nginx-*/h5bp/* . \

0 commit comments

Comments
 (0)