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

Compare commits

base: krd:ad28448d0c1e7c2cb53820760d6d034470ff0ce3
Branches Tags
krd:main
..
compare: krd:bb16585e34c17636eef01fe88120ca872bd65f23
Branches Tags
krd:main

No commits in common. "ad28448d0c1e7c2cb53820760d6d034470ff0ce3" and "bb16585e34c17636eef01fe88120ca872bd65f23" have entirely different histories.
ad28448d0c ... bb16585e34

18 changed files with 19 additions and 25 deletions
Show Stats Expand all files Collapse all files

5
Dockerfile
View File

@ -96,10 +96,7 @@ RUN _UID=11111 _GID=11111 ; \
echo "angie:x:${_GID}:" >> /etc/group ; \ echo "angie:x:${_GID}:" >> /etc/group ; \
echo 'angie:!:::::::' >> /etc/shadow echo 'angie:!:::::::' >> /etc/shadow
RUN apt-install.sh \ RUN apt-install.sh angie ; \
angie \
angie-console-light \
; \
apt-clean.sh ; \ apt-clean.sh ; \
## verify Angie layout ## verify Angie layout
[ -d "${ANGIE_MODULES_DIR}" ] ; \ [ -d "${ANGIE_MODULES_DIR}" ] ; \

6
Dockerfile.deps
View File

@ -37,12 +37,6 @@ RUN w=$(mktemp -d) ; : "${w:?}" ; \
"${PYTHON_SITE_PACKAGES}/netaddr/tests" \ "${PYTHON_SITE_PACKAGES}/netaddr/tests" \
"${PYTHON_SITE_PACKAGES}/psutil/tests" \ "${PYTHON_SITE_PACKAGES}/psutil/tests" \
; \ ; \
truncate -s 0 \
"${PYTHON_SITE_PACKAGES}/netaddr/eui/iab.idx" \
"${PYTHON_SITE_PACKAGES}/netaddr/eui/iab.txt" \
"${PYTHON_SITE_PACKAGES}/netaddr/eui/oui.txt" \
"${PYTHON_SITE_PACKAGES}/netaddr/eui/oui.idx" \
; \
find "${PYTHON_SITE_PACKAGES}/" -type f -name '*.so*' -exec ls -l {} + ; \ find "${PYTHON_SITE_PACKAGES}/" -type f -name '*.so*' -exec ls -l {} + ; \
echo ; \ echo ; \
find "${PYTHON_SITE_PACKAGES}/" -type f -name '*.so*' -printf '%p\0' \ find "${PYTHON_SITE_PACKAGES}/" -type f -name '*.so*' -printf '%p\0' \

2
build-scripts/image-base.sh
View File

@ -2,7 +2,7 @@
set -ef set -ef
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
IMAGE_VERSION="${IMAGE_VERSION:-v0.0.4}" IMAGE_VERSION="${IMAGE_VERSION:-v0.0.3}"
set -a set -a
BUILDAH_FORMAT="${BUILDAH_FORMAT:-docker}" BUILDAH_FORMAT="${BUILDAH_FORMAT:-docker}"

2
build-scripts/image-deps.sh
View File

@ -2,7 +2,7 @@
set -ef set -ef
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
IMAGE_VERSION="${IMAGE_VERSION:-v0.0.4}" IMAGE_VERSION="${IMAGE_VERSION:-v0.0.3}"
set -a set -a
BUILDAH_FORMAT="${BUILDAH_FORMAT:-docker}" BUILDAH_FORMAT="${BUILDAH_FORMAT:-docker}"

2
build-scripts/image.sh
View File

@ -2,7 +2,7 @@
set -ef set -ef
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
IMAGE_VERSION="${IMAGE_VERSION:-v0.0.4}" IMAGE_VERSION="${IMAGE_VERSION:-v0.0.3}"
set -a set -a
BUILDAH_FORMAT="${BUILDAH_FORMAT:-docker}" BUILDAH_FORMAT="${BUILDAH_FORMAT:-docker}"

2
doc/examples/basic/Dockerfile
View File

@ -1,4 +1,4 @@
FROM docker.io/rockdrilla/angie-conv:v0.0.4 FROM docker.io/rockdrilla/angie-conv:v0.0.3
SHELL [ "/bin/sh", "-ec" ] SHELL [ "/bin/sh", "-ec" ]
COPY /site/ /etc/angie/site/ COPY /site/ /etc/angie/site/

2
doc/examples/basic/README.md
View File

@ -11,7 +11,7 @@ server {
Dockerfile: Dockerfile:
```dockerfile ```dockerfile
FROM docker.io/rockdrilla/angie-conv:v0.0.4 FROM docker.io/rockdrilla/angie-conv:v0.0.3
COPY /site/ /etc/angie/site/ COPY /site/ /etc/angie/site/
COPY /static/ /etc/angie/static/ COPY /static/ /etc/angie/static/

2
doc/examples/config-template/README.md
View File

@ -58,7 +58,7 @@ services:
my-cache: my-cache:
container_name: my-cache container_name: my-cache
image: docker.io/rockdrilla/angie-conv:v0.0.4 image: docker.io/rockdrilla/angie-conv:v0.0.3
restart: always restart: always
privileged: true privileged: true
stop_grace_period: 15s stop_grace_period: 15s

3
doc/examples/config-template/conf/image-entry/81-angie-console-light.sh Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh
apt-install.sh angie-console-light
apt-clean.sh

2
doc/examples/config-template/docker-compose.yml
View File

@ -4,7 +4,7 @@ services:
my-cache: my-cache:
container_name: my-cache container_name: my-cache
image: docker.io/rockdrilla/angie-conv:v0.0.4 image: docker.io/rockdrilla/angie-conv:v0.0.3
restart: always restart: always
privileged: true privileged: true
stop_grace_period: 15s stop_grace_period: 15s

2
doc/examples/njs/Dockerfile
View File

@ -1,4 +1,4 @@
FROM docker.io/rockdrilla/angie-conv:v0.0.4 FROM docker.io/rockdrilla/angie-conv:v0.0.3
SHELL [ "/bin/sh", "-ec" ] SHELL [ "/bin/sh", "-ec" ]
COPY /site/ /etc/angie/site/ COPY /site/ /etc/angie/site/

2
doc/examples/njs/README.md
View File

@ -3,7 +3,7 @@
Dockerfile: Dockerfile:
```dockerfile ```dockerfile
FROM docker.io/rockdrilla/angie-conv:v0.0.4 FROM docker.io/rockdrilla/angie-conv:v0.0.3
COPY /site/ /etc/angie/site/ COPY /site/ /etc/angie/site/

2
doc/examples/perl/Dockerfile
View File

@ -1,4 +1,4 @@
FROM docker.io/rockdrilla/angie-conv:v0.0.4 FROM docker.io/rockdrilla/angie-conv:v0.0.3
SHELL [ "/bin/sh", "-ec" ] SHELL [ "/bin/sh", "-ec" ]
COPY /site/ /etc/angie/site/ COPY /site/ /etc/angie/site/

2
doc/examples/perl/README.md
View File

@ -3,7 +3,7 @@
Dockerfile: Dockerfile:
```dockerfile ```dockerfile
FROM docker.io/rockdrilla/angie-conv:v0.0.4 FROM docker.io/rockdrilla/angie-conv:v0.0.3
COPY /site/ /etc/angie/site/ COPY /site/ /etc/angie/site/

2
doc/examples/ssl/Dockerfile
View File

@ -1,4 +1,4 @@
FROM docker.io/rockdrilla/angie-conv:v0.0.4 FROM docker.io/rockdrilla/angie-conv:v0.0.3
SHELL [ "/bin/sh", "-ec" ] SHELL [ "/bin/sh", "-ec" ]
COPY /site/ /etc/angie/site/ COPY /site/ /etc/angie/site/

2
doc/examples/ssl/README.md
View File

@ -3,7 +3,7 @@
Dockerfile: Dockerfile:
```dockerfile ```dockerfile
FROM docker.io/rockdrilla/angie-conv:v0.0.4 FROM docker.io/rockdrilla/angie-conv:v0.0.3
COPY /site/ /etc/angie/site/ COPY /site/ /etc/angie/site/
COPY /static/ /etc/angie/static/ COPY /static/ /etc/angie/static/

2
doc/examples/static-template/Dockerfile
View File

@ -1,4 +1,4 @@
FROM docker.io/rockdrilla/angie-conv:v0.0.4 FROM docker.io/rockdrilla/angie-conv:v0.0.3
SHELL [ "/bin/sh", "-ec" ] SHELL [ "/bin/sh", "-ec" ]
COPY /site/ /etc/angie/site/ COPY /site/ /etc/angie/site/

2
doc/examples/static-template/README.md
View File

@ -13,7 +13,7 @@ server {
Dockerfile: Dockerfile:
```dockerfile ```dockerfile
FROM docker.io/rockdrilla/angie-conv:v0.0.4 FROM docker.io/rockdrilla/angie-conv:v0.0.3
COPY /site/ /etc/angie/site/ COPY /site/ /etc/angie/site/
COPY /static/ /etc/angie/static/ COPY /static/ /etc/angie/static/