paulmataruso/11note-docker-nginx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 1.24.0

Browse Source
This commit is contained in:
ElevenNotes
2023-04-26 09:15:34 +02:00
parent 7c05bc5b41
commit 33bd88a672
9 changed files with 73 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
amd64.dockerfile
View File

@@ -1,6 +1,6 @@
# :: Build # :: Build
FROM alpine:latest as nginx FROM alpine:latest as nginx
ENV NGINX_VERSION 1.22.1 ENV NGINX_VERSION 1.24.0
ENV ADD_MODULE_HEADERS_MORE_NGINX_VERSION 0.33 ENV ADD_MODULE_HEADERS_MORE_NGINX_VERSION 0.33
RUN set -ex; \ RUN set -ex; \
@@ -100,10 +100,10 @@
USER root USER root
# :: prepare # :: prepare
RUN set -ex; \ RUN set -ex; \
mkdir -p /nginx; \ mkdir -p /nginx; \
mkdir -p /nginx/etc; \ mkdir -p /nginx/etc; \
mkdir -p /nginx/www; \ mkdir -p /nginx/www; \
mkdir -p /nginx/ssl; \ mkdir -p /nginx/ssl; \
mkdir -p /nginx/cache; \ mkdir -p /nginx/cache; \
mkdir -p /nginx/run; mkdir -p /nginx/run;
@@ -124,7 +124,7 @@
adduser --uid 1000 -D -S -h /nginx -s /sbin/nologin -G nginx nginx; adduser --uid 1000 -D -S -h /nginx -s /sbin/nologin -G nginx nginx;
# :: copy root filesystem changes # :: copy root filesystem changes
COPY ./rootfs / COPY ./rootfs /
# :: docker -u 1000:1000 (no root initiative) # :: docker -u 1000:1000 (no root initiative)
RUN set -ex; \ RUN set -ex; \
@@ -136,8 +136,8 @@
VOLUME ["/nginx/etc", "/nginx/www", "/nginx/ssl"] VOLUME ["/nginx/etc", "/nginx/www", "/nginx/ssl"]
# :: Monitor # :: Monitor
RUN set -ex; chmod +x /usr/local/bin/healthcheck.sh RUN set -ex; chmod +x /usr/local/bin/healthcheck.sh
HEALTHCHECK CMD /usr/local/bin/healthcheck.sh || exit 1 HEALTHCHECK CMD /usr/local/bin/healthcheck.sh || exit 1
# :: Start # :: Start
RUN set -ex; chmod +x /usr/local/bin/entrypoint.sh RUN set -ex; chmod +x /usr/local/bin/entrypoint.sh

2
arm32v7.dockerfile
View File

@@ -6,7 +6,7 @@
# :: Builder # :: Builder
FROM arm32v7/alpine:latest as nginx FROM arm32v7/alpine:latest as nginx
COPY --from=builder qemu-arm-static /usr/bin COPY --from=builder qemu-arm-static /usr/bin
ENV NGINX_VERSION 1.22.1 ENV NGINX_VERSION 1.24.0
ENV ADD_MODULE_HEADERS_MORE_NGINX_VERSION 0.33 ENV ADD_MODULE_HEADERS_MORE_NGINX_VERSION 0.33
RUN set -ex; \ RUN set -ex; \

2
arm64v8.dockerfile
View File

@@ -6,7 +6,7 @@
# :: Builder # :: Builder
FROM arm64v8/alpine:latest as nginx FROM arm64v8/alpine:latest as nginx
COPY --from=builder qemu-aarch64-static /usr/bin COPY --from=builder qemu-aarch64-static /usr/bin
ENV NGINX_VERSION 1.22.1 ENV NGINX_VERSION 1.24.0
ENV ADD_MODULE_HEADERS_MORE_NGINX_VERSION 0.33 ENV ADD_MODULE_HEADERS_MORE_NGINX_VERSION 0.33
RUN set -ex; \ RUN set -ex; \

4
hooks/post_push
View File

@@ -1,4 +0,0 @@
#!/bin/bash
curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-amd64
chmod +x manifest-tool
./manifest-tool push from-spec multi-arch-manifest.yaml

16
multi-arch-manifest.yaml
View File

@@ -1,16 +0,0 @@
image: 11notes/nginx:stable
manifests:
- image: 11notes/nginx:amd64-1.22.1
platform:
architecture: amd64
os: linux
- image: 11notes/nginx:arm64v8-1.22.1
platform:
architecture: arm64
os: linux
variant: v8
- image: 11notes/nginx:arm32v7-1.22.1
platform:
architecture: arm
os: linux
variant: v7

12
rootfs/nginx/etc/default.conf
View File

@@ -1,9 +1,9 @@
server { server {
listen 8080 default_server; listen 8080 default_server;
server_name _; server_name _;
root /nginx/www/default; root /nginx/www/default;
location / { location / {
try_files $uri /index.html; try_files $uri /index.html;
} }
} }

101
rootfs/nginx/www/default/index.html
View File

@@ -1,62 +1,61 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>11notes/nginx:stable</title> <title>11notes/nginx:stable</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Inconsolata" /> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Inconsolata" />
<style> <style>
html, html,
body { body {
height: 100%; height: 100%;
} }
body { body {
margin: 0; margin: 0;
} }
.container { .container {
height: 100%; height: 100%;
padding: 0; padding: 0;
margin: 0; margin: 0;
display: -webkit-box; display: -webkit-box;
display: -moz-box; display: -moz-box;
display: -ms-flexbox; display: -ms-flexbox;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
} }
.content { .content {
align-self: center; align-self: center;
} }
.text { .text {
font-size:1em; cursor:default; font-size:1em; cursor:default;
font-family:'Inconsolata'; font-family:'Inconsolata';
} }
.comment {
font-size:1em; cursor:default;
font-family:'Inconsolata';
color:darkgreen;
font-style:italic;
}
.comment {
font-size:1em; cursor:default;
font-family:'Inconsolata';
color:darkgreen;
font-style:italic;
}
</style> </style>
</head> </head>
<body> <body>
<div class="container"> <div class="container">
<div class="content"> <div class="content">
<div class="text"> <div class="text">
docker run --name nginx \<br /> docker run --name nginx \<br />
&emsp;-v volume-etc:/nginx/etc \<br /> &emsp;-v volume-etc:/nginx/etc \<br />
&emsp;-v volume-www:/nginx/www \<br /> &emsp;-v volume-www:/nginx/www \<br />
&emsp;-v volume-ssl:/nginx/ssl:ro \<br /> &emsp;-v volume-ssl:/nginx/ssl:ro \<br />
&emsp;-d 11notes/nginx:[tag] &emsp;-d 11notes/nginx:[tag]
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

12
rootfs/usr/local/bin/entrypoint.sh
View File

@@ -1,8 +1,8 @@
#!/bin/ash #!/bin/ash
if [ -z "$1" ]; then if [ -z "$1" ]; then
set -- "nginx" \ set -- "nginx" \
-g \ -g \
'daemon off;' 'daemon off;'
fi fi
exec "$@" exec "$@"

2
rootfs/usr/local/bin/healthcheck.sh
View File

@@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
curl --max-time 5 -kILs --fail http://localhost:8080 curl --max-time 5 -kILs --fail http://localhost:8080