From a72875733ba399cc488cee45f9a566eb4058139a Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Thu, 30 Jun 2022 20:30:34 -0400 Subject: [PATCH 1/5] Aplicando Docker para montar el archivo --- Dockerfile | 11 +++++++++++ docker-compose.yml | 10 ++++++++++ 2 files changed, 21 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..d74184d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM rust AS build +WORKDIR /code +COPY ./code . +RUN cargo install --path . + +FROM debian:buster-slim +COPY --from=build /usr/local/cargo/bin/clima /usr/local/bin/clima +RUN apt-get update && apt-get install -y libssl-dev && rm -rf /var/lib/apt/lists/* +ENV ACCUWHEATHER_API_ID "1" +ENV PATH_TO_CITIES "/share/cities" +CMD ["clima", $ACCUWHEATHER_API_ID, $PATH_TO_CITIES] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..dfca0a7 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,10 @@ +version: '3' + +services: + app: + image: rust + build: . + env_file: + - .env + volumes: + - ./cities.json:/share/cities.json From b0c880ef0996bc5cbcdf3db2ebd7cc63c472957b Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Thu, 30 Jun 2022 23:13:12 -0400 Subject: [PATCH 2/5] Muestra de .env --- .env.sample | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .env.sample diff --git a/.env.sample b/.env.sample new file mode 100644 index 0000000..2c1f651 --- /dev/null +++ b/.env.sample @@ -0,0 +1,2 @@ +ACCUWHEATHER_API_ID=######## +PATH_TO_CITIES="/share/cities.json" From 5df09d8440d60b6ac5f2be2c724fe6babb699ee3 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Thu, 30 Jun 2022 23:13:35 -0400 Subject: [PATCH 3/5] FIX: comando en Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d74184d..3cbdfb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,5 +7,5 @@ FROM debian:buster-slim COPY --from=build /usr/local/cargo/bin/clima /usr/local/bin/clima RUN apt-get update && apt-get install -y libssl-dev && rm -rf /var/lib/apt/lists/* ENV ACCUWHEATHER_API_ID "1" -ENV PATH_TO_CITIES "/share/cities" -CMD ["clima", $ACCUWHEATHER_API_ID, $PATH_TO_CITIES] +ENV PATH_TO_CITIES "/share/cities.json" +CMD [ "sh", "-c", "/usr/local/bin/clima $ACCUWHEATHER_API_ID $PATH_TO_CITIES" ] From b217a98ead9afc32462b932517ab5d947b5e7327 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Thu, 30 Jun 2022 23:13:58 -0400 Subject: [PATCH 4/5] =?UTF-8?q?Nueva=20forma=20de=20correr=20la=20aplicaci?= =?UTF-8?q?=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 319782c..1af7164 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Call ``` -app ACCUWHEATHER_API_ID PATH_TO_CITIES.txt +docker compose up ``` From ce53d54e8f959ef38936c1d79a349b8c1e704508 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Fri, 1 Jul 2022 11:44:08 -0400 Subject: [PATCH 5/5] Comandos para compilar --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 1af7164..d37f9f5 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,15 @@ ``` docker compose up ``` + +# Compile / Build + +``` +docker compose build +``` + +# Rebuild + +``` +docker compose down --rmi all; docker compose build +```