diff --git a/Dockerfile b/Dockerfile index da15ecb..af70e38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,10 +51,6 @@ postgresql-libs \ ttf-ubuntu-font-family -RUN addgroup -S -g 101 netbox \ - && adduser -DHS -u 101 netbox \ - && adduser netbox netbox - WORKDIR /opt COPY --from=builder /install /usr/local @@ -73,10 +69,11 @@ WORKDIR /opt/netbox/netbox # Must set permissions for '/opt/netbox/netbox/static' directory -# to a+w so that `./manage.py collectstatic` can be executed during +# to g+w so that `./manage.py collectstatic` can be executed during # container startup. -# Not satisfying -RUN mkdir static && chmod a+w static media +# Must set permissions for '/opt/netbox/netbox/media' directory +# to g+w so that pictures can be uploaded to netbox. +RUN mkdir static && chmod g+w static media ENTRYPOINT [ "/opt/netbox/docker-entrypoint.sh" ] diff --git a/docker-compose.yml b/docker-compose.yml index da5fbd5..874ff3e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ - redis - netbox-worker env_file: env/netbox.env - user: netbox + user: '101' volumes: - ./startup_scripts:/opt/netbox/startup_scripts:z,ro - ./initializers:/opt/netbox/initializers:z,ro