matthew/netbox-docker
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1010 from tobiasge/image-update

Browse Source 
Update Ubuntu und Nginx Unit
This commit is contained in:
Tobias Genannt 2023-05-11 13:01:21 +02:00 committed by GitHub
commit 0d748ed392
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,6 +1,6 @@
*.sql.gz *.sql.gz
.netbox .netbox
.initializers .python-version
docker-compose.override.yml docker-compose.override.yml
*.pem *.pem
configuration/* configuration/*
@ -11,5 +11,4 @@ configuration/ldap/*
!configuration/ldap/ldap_config.py !configuration/ldap/ldap_config.py
!configuration/logging.py !configuration/logging.py
!configuration/plugins.py !configuration/plugins.py
prometheus.yml
super-linter.log super-linter.log

10
Dockerfile
View File

@ -66,15 +66,15 @@ RUN export DEBIAN_FRONTEND=noninteractive \
python3 \ python3 \
python3-distutils \ python3-distutils \
tini \ tini \
&& curl -sL https://nginx.org/keys/nginx_signing.key \ && curl --silent --output /usr/share/keyrings/nginx-keyring.gpg \
> /etc/apt/trusted.gpg.d/nginx.asc && \ https://unit.nginx.org/keys/nginx-keyring.gpg \
echo "deb https://packages.nginx.org/unit/ubuntu/ jammy unit" \ && echo "deb [signed-by=/usr/share/keyrings/nginx-keyring.gpg] https://packages.nginx.org/unit/ubuntu/ lunar unit" \
> /etc/apt/sources.list.d/unit.list \ > /etc/apt/sources.list.d/unit.list \
&& 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=1.29.1-1~jammy \ unit=1.30.0-1~lunar \
unit-python3.10=1.29.1-1~jammy \ unit-python3.11=1.30.0-1~lunar \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY --from=builder /opt/netbox/venv /opt/netbox/venv COPY --from=builder /opt/netbox/venv /opt/netbox/venv

4
build.sh
View File

@ -61,7 +61,7 @@ DOCKERFILE The name of Dockerfile to use.
${_GREEN}Default:${_CLEAR} Dockerfile ${_GREEN}Default:${_CLEAR} Dockerfile
DOCKER_FROM The base image to use. DOCKER_FROM The base image to use.
${_GREEN}Default:${_CLEAR} 'ubuntu:22.04' ${_GREEN}Default:${_CLEAR} 'ubuntu:23.04'
BUILDX_PLATFORMS BUILDX_PLATFORMS
Specifies the platform(s) to build the image for. Specifies the platform(s) to build the image for.
@ -219,7 +219,7 @@ fi
# Determining the value for DOCKER_FROM # Determining the value for DOCKER_FROM
### ###
if [ -z "$DOCKER_FROM" ]; then if [ -z "$DOCKER_FROM" ]; then
DOCKER_FROM="docker.io/ubuntu:22.04" DOCKER_FROM="docker.io/ubuntu:23.04"
fi fi
### ###

4
docker/launch-netbox.sh
View File

@ -51,7 +51,7 @@ exec unitd \
--control unix:$UNIT_SOCKET \ --control unix:$UNIT_SOCKET \
--pid /opt/unit/unit.pid \ --pid /opt/unit/unit.pid \
--log /dev/stdout \ --log /dev/stdout \
--state /opt/unit/state/ \ --statedir /opt/unit/state/ \
--tmp /opt/unit/tmp/ \ --tmpdir /opt/unit/tmp/ \
--user unit \ --user unit \
--group root --group root