krd/angie-conv-image
1
0
Fork 0
Code

misc minor fixes

Browse Source
This commit is contained in:
Konstantin Demin 2024-07-20 17:12:15 +03:00
parent 5d3307fe57
commit 288d27f9f2
Signed by: krd
GPG Key ID: 4D56F87A8BA65FD0
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Dockerfile
View File

@ -1,8 +1,8 @@
FROM docker.io/rockdrilla/angie-conv:deps-v1 as deps FROM docker.io/rockdrilla/angie-conv:deps-v1 AS deps
## --- ## ---
FROM deps as certs FROM deps AS certs
SHELL [ "/bin/sh", "-ec" ] SHELL [ "/bin/sh", "-ec" ]
COPY /scripts/* /usr/local/sbin/ COPY /scripts/* /usr/local/sbin/
@ -20,7 +20,7 @@ RUN pkg='curl' ; \
## --- ## ---
FROM deps as pycache FROM deps AS pycache
SHELL [ "/bin/sh", "-ec" ] SHELL [ "/bin/sh", "-ec" ]
COPY /scripts/* /usr/local/sbin/ COPY /scripts/* /usr/local/sbin/
@ -136,7 +136,7 @@ RUN install -d -o angie -g angie -m 03777 /angie /run/angie ; \
ln -sv /run/angie/lib /var/lib/angie ; \ ln -sv /run/angie/lib /var/lib/angie ; \
ln -sv /run/angie/log /var/log/angie ; \ ln -sv /run/angie/log /var/log/angie ; \
## adjust paths in config directory ## adjust paths in config directory
cd /etc/angie/ ; \ cd /etc/angie || exit 1 ; \
ln -sv /run/angie run ; \ ln -sv /run/angie run ; \
ln -sv /run/angie/lock lock.d ; \ ln -sv /run/angie/lock lock.d ; \
ln -sv ${ANGIE_MODULES_DIR} modules.dist ; \ ln -sv ${ANGIE_MODULES_DIR} modules.dist ; \
@ -161,7 +161,7 @@ RUN find /etc/angie/ -name .gitkeep -delete ; \
## preseed builtin modules list ## preseed builtin modules list
RUN x='angie-builtin-modules.sh' ; \ RUN x='angie-builtin-modules.sh' ; \
"$x" ; \ "$x" ; \
chmod a-x $(which "$x") chmod a-x "$(which "$x")"
## misc tools ## misc tools
RUN apt-install.sh \ RUN apt-install.sh \
@ -196,8 +196,7 @@ COPY /image-entry.d/ /image-entry.d/
## misc defaults ## misc defaults
ENV DUMB_INIT_SETSID=0 \ ENV DUMB_INIT_SETSID=0 \
MALLOC_ARENA_MAX=4 \ MALLOC_ARENA_MAX=4
GOMAXPROCS=4
STOPSIGNAL SIGQUIT STOPSIGNAL SIGQUIT

8
Dockerfile.base
View File

@ -1,8 +1,8 @@
# FROM docker.io/debian:bookworm-slim as base-upstream # FROM docker.io/debian:bookworm-slim as base-upstream
ARG PYTHONTAG=3.11.9-slim-bookworm ARG PYTHONTAG=3.11.9-slim-bookworm
FROM docker.io/python:${PYTHONTAG} as base-upstream FROM docker.io/python:${PYTHONTAG} AS base-upstream
FROM base-upstream as base FROM base-upstream AS base
SHELL [ "/bin/sh", "-ec" ] SHELL [ "/bin/sh", "-ec" ]
COPY /Dockerfile.base /usr/local/share/ COPY /Dockerfile.base /usr/local/share/
@ -52,8 +52,8 @@ RUN apt-env.sh apt-get update ; \
## perl-base: hardlink->symlink ## perl-base: hardlink->symlink
RUN d=/usr/bin ; \ RUN d=/usr/bin ; \
find $d/ -wholename "$d/perl5*" -exec ln -fsv perl {} ';' ; \ find "$d/" -wholename "$d/perl5*" -exec ln -fsv perl {} ';' ; \
ls -li $d/perl* ls -li "$d/perl"*
## remove unwanted binaries ## remove unwanted binaries
RUN set -f ; \ RUN set -f ; \

8
Dockerfile.deps
View File

@ -1,8 +1,8 @@
FROM docker.io/rockdrilla/angie-conv:base-v1 as base FROM docker.io/rockdrilla/angie-conv:base-v1 AS base
## --- ## ---
FROM base as setup FROM base AS setup
SHELL [ "/bin/sh", "-ec" ] SHELL [ "/bin/sh", "-ec" ]
COPY /scripts/* /usr/local/sbin/ COPY /scripts/* /usr/local/sbin/
@ -29,7 +29,7 @@ ENV CIBUILDWHEEL=1
# pyyaml # pyyaml
ENV PYYAML_FORCE_CYTHON=1 ENV PYYAML_FORCE_CYTHON=1
RUN w=$(mktemp -d) ; \ RUN w=$(mktemp -d) ; : "${w:?}" ; \
{ apt-mark showauto ; apt-mark showmanual ; } | sort -uV > "$w/t0" ; \ { apt-mark showauto ; apt-mark showmanual ; } | sort -uV > "$w/t0" ; \
printf '%s\n' ${DEV_PACKAGES} | sort -uV > "$w/t1" ; \ printf '%s\n' ${DEV_PACKAGES} | sort -uV > "$w/t1" ; \
apt-install.sh ${DEV_PACKAGES} ; \ apt-install.sh ${DEV_PACKAGES} ; \
@ -61,7 +61,7 @@ RUN w=$(mktemp -d) ; \
## --- ## ---
FROM base as deps FROM base AS deps
SHELL [ "/bin/sh", "-ec" ] SHELL [ "/bin/sh", "-ec" ]
COPY /Dockerfile.deps /usr/local/share/ COPY /Dockerfile.deps /usr/local/share/

2
scripts/angie-builtin-modules.sh
View File

@ -5,7 +5,7 @@ conf_dir='/etc/angie'
conf_file="${conf_dir}/.none.conf" conf_file="${conf_dir}/.none.conf"
pid_file='/run/angie/none.pid' pid_file='/run/angie/none.pid'
angie -g "error_log /dev/stderr warn; pid ${pid_file};" -c "${conf_file}" -t angie -q -e /dev/stderr -g "error_log /dev/stderr warn; pid ${pid_file};" -c "${conf_file}" -t
r=$? r=$?
rm -f "${pid_file}" rm -f "${pid_file}"
[ $r -eq 0 ] || exit $r [ $r -eq 0 ] || exit $r