diff --git a/.devcontainer/Containerfile b/.devcontainer/Containerfile index dbe6b4bb2..579273788 100644 --- a/.devcontainer/Containerfile +++ b/.devcontainer/Containerfile @@ -9,7 +9,7 @@ ENV DEBIAN_FRONTEND="noninteractive" RUN apt-get update && \ apt-get install -y --no-install-recommends podman podman-compose \ fuse-overlayfs slirp4netns uidmap iptables aardvark-dns nftables ca-certificates sudo \ - git ssh && \ + git && \ apt-get upgrade -y RUN useradd webgui -s /bin/bash && \ diff --git a/Dockerfile b/Dockerfile index 33d07a262..bee1e043b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,11 @@ -# Podman Containerfile -# build via compose.yml or: -# podman image build -q -t debian:podman-trixie -f Containerfile . FROM debian:trixie -ENV DEBIAN_FRONTEND="noninteractive" +ENV DEBIAN_FRONTEND=noninteractive RUN apt update && apt -y install perl cpanminus libaspell-dev make libdbd-mysql-perl libdigest-perl-md5-perl libxml-simple-perl \ libmodule-install-perl gcc libperl-dev default-libmysqlclient-dev libpng-dev build-essential libgd-dev mariadb-client imagemagick \ libpng-dev libjpeg-dev libtiff-dev libapache2-mod-perl2 libapache2-mod-perl2-dev libapache2-request-perl libimage-magick-perl vim \ - apache2 apache2-utils mailutils \ -# could be removed for production: - curl procps + apache2 apache2-utils mailutils RUN cpanm --notest --no-cache --force \ @@ -173,11 +168,6 @@ RUN useradd --home=/data/WebGUI webgui; chown -R webgui: /data/WebGUI; chmod 755 #USER webgui -# zorgt voor een andere shell prompt in de container gestart in de development container -# ook wanneer die in dezelfde UTC namespace zit - always /after/ USER command -ENV CONTAINER_CONTEXT=inner -RUN printf '%s\n' 'export PS1="\u@${CONTAINER_CONTEXT}:\w\\$ "' >> ~/.bashrc - WORKDIR /data/WebGUI CMD [ "/entrypoint" ] diff --git a/distribution/docker-compose.yml b/distribution/docker-compose.yml index 2d64ab285..af39eaf88 100644 --- a/distribution/docker-compose.yml +++ b/distribution/docker-compose.yml @@ -29,7 +29,7 @@ services: - "80" nginx-proxy: - image: docker.io/nginx:latest + image: nginx:latest container_name: nginx_proxy depends_on: - webgui