|
|
@ -1,13 +1,9 @@ |
|
|
# yup, python 3.11! |
|
|
# yup, python 3.11! |
|
|
FROM python:3.11-slim |
|
|
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 |
|
|
# 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 |
|
|
# copy our nginx configuration to overwrite nginx defaults |
|
|
RUN rm /etc/nginx/sites-enabled/default |
|
|
RUN rm /etc/nginx/sites-enabled/default |
|
|
RUN rm /etc/nginx/sites-available/default |
|
|
RUN rm /etc/nginx/sites-available/default |
|
|
|
