update
This commit is contained in:
@@ -2,7 +2,7 @@ version: "3.7"
|
||||
|
||||
services:
|
||||
nginx:
|
||||
image: harbor.colben.cn/general/nginx
|
||||
image: harbor.boyachain.cn:20443/general/nginx
|
||||
container_name: nginx
|
||||
restart: "on-failure"
|
||||
stop_grace_period: 5m
|
||||
|
||||
@@ -2,7 +2,7 @@ version: "3.7"
|
||||
|
||||
services:
|
||||
keepalived:
|
||||
image: harbor.colben.cn/general/keepalived
|
||||
image: harbor.boyachain.cn:20443/general/keepalived
|
||||
container_name: keepalived
|
||||
restart: "on-failure"
|
||||
stop_grace_period: 1m
|
||||
@@ -17,7 +17,7 @@ services:
|
||||
target: /var/log/keepalived
|
||||
|
||||
nginx:
|
||||
image: harbor.colben.cn/general/nginx
|
||||
image: harbor.boyachain.cn:20443/general/nginx
|
||||
container_name: nginx
|
||||
restart: "on-failure"
|
||||
stop_grace_period: 1m
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
ARG ARCH
|
||||
FROM harbor.colben.cn/general/alpine$ARCH
|
||||
FROM harbor.colben.cn/general/alpine$ARCH:3.15
|
||||
MAINTAINER Colben colbenlee@gmail.com
|
||||
ADD --chown=root:root /ADD/ /opt/
|
||||
RUN apk update \
|
||||
20
nginx/Dockerfile-latest
Normal file
20
nginx/Dockerfile-latest
Normal file
@@ -0,0 +1,20 @@
|
||||
ARG ARCH
|
||||
FROM harbor.colben.cn/general/alpine$ARCH:3.20
|
||||
MAINTAINER Colben colbenlee@gmail.com
|
||||
ADD --chown=root:root /ADD/ /opt/
|
||||
RUN apk update \
|
||||
&& apk add --no-cache nginx nginx-mod-stream \
|
||||
&& sed -i \
|
||||
-e '1a\\n# Added by Dockerfile' \
|
||||
-e '1adaemon off;' \
|
||||
-e '1apid /run/nginx/nginx.pid;' \
|
||||
-e '1aworker_rlimit_nofile 65535;' \
|
||||
-e '/^user /s/^/#/' \
|
||||
-e '/^worker_processes /s/^/#/' \
|
||||
-e '/worker_connections/s/[0-9]\+/10240/' \
|
||||
/etc/nginx/nginx.conf \
|
||||
&& chown nginx:nginx /run/nginx \
|
||||
&& chmod 0755 /var/lib/nginx \
|
||||
&& rm -rf /var/cache/apk/* /etc/nginx/http.d/*
|
||||
CMD ["/opt/ccmd"]
|
||||
|
||||
@@ -9,7 +9,8 @@ export LANG=en_US.UTF-8
|
||||
|
||||
[ 'x86_64' == "$(uname -m)" ] && ARCH='' || ARCH="-$(uname -m)"
|
||||
ROOT_DIR="$(cd $(dirname $0) && pwd)"
|
||||
IMAGE="harbor.colben.cn/general/$(basename ${0%.sh})$ARCH:latest"
|
||||
TAG=$1
|
||||
IMAGE="harbor.colben.cn/general/$(basename ${0%.sh})$ARCH:$TAG"
|
||||
|
||||
if [ -t 0 ]; then
|
||||
function Print { echo -e "\033[36;1m$(date +'[%F %T]')\033[32;1m $*\033[0m"; }
|
||||
@@ -51,7 +52,7 @@ function Build {
|
||||
&& Warn Removing image $IMAGE ... \
|
||||
&& docker rmi $IMAGE
|
||||
Warn Building image: $IMAGE ...
|
||||
docker build --force-rm --build-arg ARCH="$ARCH" -t $IMAGE .
|
||||
docker build --force-rm --build-arg ARCH="$ARCH" -t $IMAGE -f Dockerfile-$TAG .
|
||||
YesOrNo Push image: $IMAGE? && docker push $IMAGE
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user