changes on Flowcore

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

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

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/

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

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"]

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]

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/

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