From aff7031c4fbbcbb04875a8d0e4c5a11ffcce9746 Mon Sep 17 00:00:00 2001 From: Celestino Rey Date: Wed, 12 Feb 2025 16:19:24 +0100 Subject: [PATCH] Corrigo Dockerfile --- Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index bff326b..01aea4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,9 @@ # yup, python 3.11! FROM python:3.11-slim -<<<<<<< HEAD -# install nginx -RUN apt-get update && apt-get install nginx netcat-openbsd rsync -y -======= # install nginx y otras cosas -RUN apt-get update && apt-get install nginx netcat-openbsd curl vim jq -y ->>>>>>> c04abab64cc16d19cf44b2b6e95eb68cccfb37b5 +RUN apt-get update && apt-get install nginx netcat-openbsd curl vim jq rsync -y + # copy our nginx configuration to overwrite nginx defaults RUN rm /etc/nginx/sites-enabled/default RUN rm /etc/nginx/sites-available/default