From fb2107249c265863a64f0e5fdcc71a6e5d1320df Mon Sep 17 00:00:00 2001 From: Jesus Lara Date: Thu, 26 Sep 2024 16:29:03 +0200 Subject: [PATCH] changes on Flowcore --- Dockerfile | 2 +- Makefile | 2 +- docker/navapi/Dockerfile | 2 +- docker/navapi/Makefile | 2 +- docker/worker/Dockerfile | 7 ++----- docker/worker/Makefile | 2 +- src/Dockerfile | 2 +- src/Makefile | 8 +------- 8 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 68aa5ce..9f77861 100644 --- a/Dockerfile +++ b/Dockerfile @@ -68,7 +68,7 @@ ENV SITE_ROOT=/code ENV PATH="/code/venv/bin:/home/troc/.local/bin:$PATH" # Install and upgrade pip -RUN python3 -m pip install --upgrade pip sdist setuptools wheel==0.42.0 +RUN python3 -m pip install --upgrade pip sdist setuptools # Execute 'make install' to install all requirements RUN make install diff --git a/Makefile b/Makefile index e9eace3..d0cf1e9 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ install: pip install --upgrade asyncdb[default] pip install --upgrade navconfig[default] pip install --upgrade async-notify[all] - pip install --upgrade navigator-api[locale] + pip install --upgrade navigator-api[locale,uvloop] # Nav requirements: pip install --upgrade navigator-session pip install --upgrade navigator-auth diff --git a/docker/navapi/Dockerfile b/docker/navapi/Dockerfile index c2625c5..b6e9437 100644 --- a/docker/navapi/Dockerfile +++ b/docker/navapi/Dockerfile @@ -57,7 +57,7 @@ ENV SITE_ROOT=/code ENV PATH="/code/venv/bin:/home/troc/.local/bin:$PATH" # Install and upgrade pip -RUN python3 -m pip install --upgrade pip sdist setuptools wheel==0.42.0 +RUN python3 -m pip install --upgrade pip sdist setuptools # Copy the requirements to the working directory COPY Makefile /code/ diff --git a/docker/navapi/Makefile b/docker/navapi/Makefile index e9eace3..d0cf1e9 100644 --- a/docker/navapi/Makefile +++ b/docker/navapi/Makefile @@ -3,7 +3,7 @@ install: pip install --upgrade asyncdb[default] pip install --upgrade navconfig[default] pip install --upgrade async-notify[all] - pip install --upgrade navigator-api[locale] + pip install --upgrade navigator-api[locale,uvloop] # Nav requirements: pip install --upgrade navigator-session pip install --upgrade navigator-auth diff --git a/docker/worker/Dockerfile b/docker/worker/Dockerfile index 4b03d71..7166324 100644 --- a/docker/worker/Dockerfile +++ b/docker/worker/Dockerfile @@ -56,7 +56,7 @@ ENV SITE_ROOT=/code ENV PATH="/code/venv/bin:/home/troc/.local/bin:$PATH" # Install and upgrade pip -RUN python3 -m pip install --upgrade pip sdist setuptools wheel==0.42.0 +RUN python3 -m pip install --upgrade pip sdist setuptools # Copy the requirements to the working directory # Switch back to root to change file ownerships @@ -67,9 +67,6 @@ RUN chown -R troc:troc /code # Assuming /code is your working directory and also where you'll run `make image` RUN mkdir -p /home/ubuntu/symbits /var/log/troc/ RUN chown troc:troc /code /home/ubuntu/symbits /var/log/troc/ -RUN chown -R troc:troc /code/start.sh -RUN chmod 777 /code/start.sh -RUN chmod +x /code/start.sh # Switch back to troc for subsequent commands USER troc @@ -81,4 +78,4 @@ RUN make install EXPOSE 5000 RUN ls -la /code -ENTRYPOINT ["sh", "-c", "ls -la /code && exec /code/start.sh"] +ENTRYPOINT ["sh", "-c", "ls -la /code && /code/start.sh"] diff --git a/docker/worker/Makefile b/docker/worker/Makefile index 99fd795..d575179 100644 --- a/docker/worker/Makefile +++ b/docker/worker/Makefile @@ -2,7 +2,7 @@ install: pip install wheel==0.42.0 pip install --upgrade asyncdb[all] pip install --upgrade navconfig[all] - pip install --upgrade navigator-api[locale] + pip install --upgrade navigator-api[locale,uvloop] pip install --upgrade navigator-session pip install --upgrade navigator-auth pip install --upgrade async-notify[all] diff --git a/src/Dockerfile b/src/Dockerfile index 5b18b63..5b0692d 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -54,7 +54,7 @@ RUN python -m venv /opt/venv ENV PATH="/opt/venv/bin:$PATH" # Install and upgrade pip -RUN python3 -m pip install --upgrade pip sdist setuptools wheel==0.42.0 +RUN python3 -m pip install --upgrade pip sdist setuptools # Copy the requirements to the working directory COPY Makefile /code/ diff --git a/src/Makefile b/src/Makefile index 9e31419..c66f57c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,18 +3,12 @@ install: pip install --upgrade asyncdb[all] pip install --upgrade navconfig[all] pip install --upgrade async-notify[all] - pip install --upgrade navigator-api[locale] + pip install --upgrade navigator-api[locale,uvloop] # Navapi requirements: - pip install Faker==22.2.0 pip install polyline==2.0.1 pip install cartopy==0.22.0 - pip install aiormq==6.8.0 pip install transitions==0.9.0 pip install aioboto3 - # Bot: - pip install botbuilder-core==4.14.8 - pip install botbuilder-integration-aiohttp==4.14.8 - pip install botbuilder-schema==4.14.8 # Nav requirements: pip install --upgrade navigator-session pip install --upgrade navigator-auth