1
0

Compare commits

...

4 Commits

18 changed files with 25 additions and 19 deletions

View File

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

View File

@ -37,6 +37,12 @@ RUN w=$(mktemp -d) ; : "${w:?}" ; \
"${PYTHON_SITE_PACKAGES}/netaddr/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 {} + ; \
echo ; \
find "${PYTHON_SITE_PACKAGES}/" -type f -name '*.so*' -printf '%p\0' \

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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