Added some change from DEV
- Pinned unit version to prevent suprises with configuration changes - Added psql client for manage.py dbshell - Set LANG to "C.UTF8" to correctly read configuration files
This commit is contained in:
parent
7ec68ecccb
commit
543a365c58
|
@ -50,6 +50,7 @@ RUN . /etc/os-release \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
openssl \
|
openssl \
|
||||||
|
postgresql-client \
|
||||||
python3 \
|
python3 \
|
||||||
python3-distutils \
|
python3-distutils \
|
||||||
&& curl -sL https://nginx.org/keys/nginx_signing.key | \
|
&& curl -sL https://nginx.org/keys/nginx_signing.key | \
|
||||||
|
@ -59,8 +60,8 @@ RUN . /etc/os-release \
|
||||||
&& apt-get update -qq \
|
&& apt-get update -qq \
|
||||||
&& apt-get install \
|
&& apt-get install \
|
||||||
--yes -qq --no-install-recommends \
|
--yes -qq --no-install-recommends \
|
||||||
unit \
|
unit=1.26.0-1~bullseye \
|
||||||
unit-python3.9 \
|
unit-python3.9=1.26.0-1~bullseye \
|
||||||
tini \
|
tini \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
@ -86,6 +87,7 @@ WORKDIR /opt/netbox
|
||||||
# Must set permissions for '/opt/netbox/netbox/media' directory
|
# Must set permissions for '/opt/netbox/netbox/media' directory
|
||||||
# to g+w so that pictures can be uploaded to netbox.
|
# to g+w so that pictures can be uploaded to netbox.
|
||||||
RUN mkdir -p static /opt/unit/state/ /opt/unit/tmp/ \
|
RUN mkdir -p static /opt/unit/state/ /opt/unit/tmp/ \
|
||||||
|
&& chown -R unit:root /opt/netbox/netbox/media /opt/unit/ \
|
||||||
&& chmod -R g+w /opt/netbox/netbox/media /opt/unit/ \
|
&& chmod -R g+w /opt/netbox/netbox/media /opt/unit/ \
|
||||||
&& /opt/netbox/venv/bin/python -m mkdocs build \
|
&& /opt/netbox/venv/bin/python -m mkdocs build \
|
||||||
--config-file /opt/netbox/mkdocs.yml --site-dir /opt/netbox/netbox/project-static/docs/ \
|
--config-file /opt/netbox/mkdocs.yml --site-dir /opt/netbox/netbox/project-static/docs/ \
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"uri": "/static/*"
|
"uri": "/static/*"
|
||||||
},
|
},
|
||||||
"action": {
|
"action": {
|
||||||
"share": "/opt/netbox/netbox"
|
"share": "/opt/netbox/netbox${uri}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,7 @@ EMAIL_USERNAME=netbox
|
||||||
EMAIL_USE_SSL=false
|
EMAIL_USE_SSL=false
|
||||||
EMAIL_USE_TLS=false
|
EMAIL_USE_TLS=false
|
||||||
HOUSEKEEPING_INTERVAL=86400
|
HOUSEKEEPING_INTERVAL=86400
|
||||||
|
LANG=C.UTF-8
|
||||||
MAX_PAGE_SIZE=1000
|
MAX_PAGE_SIZE=1000
|
||||||
MEDIA_ROOT=/opt/netbox/netbox/media
|
MEDIA_ROOT=/opt/netbox/netbox/media
|
||||||
METRICS_ENABLED=false
|
METRICS_ENABLED=false
|
||||||
|
|
Loading…
Reference in New Issue