From 0f1cdd6afe0f898b8e8617dcfe6ddfd7865b927e Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 2 May 2024 16:00:04 -0700 Subject: [PATCH 1/8] installing newer version of bash Signed-off-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> --- Dockerfile.worker | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile.worker b/Dockerfile.worker index f7bc18c..b2d4f7f 100644 --- a/Dockerfile.worker +++ b/Dockerfile.worker @@ -3,7 +3,7 @@ FROM python:3.8-slim as base SHELL ["/bin/bash", "-c"] -RUN apt-get update -qq && apt-get install -y ssh git +RUN apt-get update -qq && apt-get install -y ssh git bash # require a private key to access private github repositories ARG SSH_PRIVATE_KEY @@ -46,6 +46,8 @@ RUN chmod a+r /etc/apt/keyrings/docker.asc RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" > /etc/apt/sources.list.d/docker.list RUN apt-get update + + RUN apt install -y docker-ce git RUN apt-get clean From a5b82b83b5d69814b725ab8844e15eb64503f510 Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 2 May 2024 16:10:04 -0700 Subject: [PATCH 2/8] installing newer version of bash, newer base Signed-off-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> --- Dockerfile.worker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.worker b/Dockerfile.worker index b2d4f7f..41b40e5 100644 --- a/Dockerfile.worker +++ b/Dockerfile.worker @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.0.0-experimental -FROM python:3.8-slim as base +FROM python:3.9-slim as base SHELL ["/bin/bash", "-c"] From 0edd1a73f9907edfaafc2e32d1cdae727d084b47 Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 2 May 2024 16:10:42 -0700 Subject: [PATCH 3/8] installing newer version of bash, newer base Signed-off-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> --- Dockerfile | 6 +++--- Dockerfile.worker | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d8caf5a..993a773 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.0.0-experimental -FROM python:3.8-slim as base +FROM python:3.9-slim as base SHELL ["/bin/bash", "-c"] @@ -10,8 +10,8 @@ EXPOSE 5000 FROM base as python-deps -RUN apt-get update -qq && apt-get install -y ssh git openssl -RUN apt-get upgrade -y openssl +RUN apt-get update -qq && apt-get install -y ssh git openssl bash +RUN apt-get upgrade -y openssl bash # require a private key to access private github repositories ARG SSH_PRIVATE_KEY diff --git a/Dockerfile.worker b/Dockerfile.worker index 41b40e5..7b0e0ee 100644 --- a/Dockerfile.worker +++ b/Dockerfile.worker @@ -4,6 +4,7 @@ FROM python:3.9-slim as base SHELL ["/bin/bash", "-c"] RUN apt-get update -qq && apt-get install -y ssh git bash +RUN apt-get upgrade -y bash # require a private key to access private github repositories ARG SSH_PRIVATE_KEY From fb69546c8005be814e5266a397d1b096cf470422 Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 2 May 2024 16:23:11 -0700 Subject: [PATCH 4/8] installing newer version of dash Signed-off-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> --- Dockerfile | 2 +- Dockerfile.worker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 993a773..d76808b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ EXPOSE 5000 FROM base as python-deps RUN apt-get update -qq && apt-get install -y ssh git openssl bash -RUN apt-get upgrade -y openssl bash +RUN apt-get upgrade -y openssl bash dash # require a private key to access private github repositories ARG SSH_PRIVATE_KEY diff --git a/Dockerfile.worker b/Dockerfile.worker index 7b0e0ee..57130c4 100644 --- a/Dockerfile.worker +++ b/Dockerfile.worker @@ -4,7 +4,7 @@ FROM python:3.9-slim as base SHELL ["/bin/bash", "-c"] RUN apt-get update -qq && apt-get install -y ssh git bash -RUN apt-get upgrade -y bash +RUN apt-get upgrade -y bash dash # require a private key to access private github repositories ARG SSH_PRIVATE_KEY From edb5c99be4960e238e1c9a77b13eb05a93846068 Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 2 May 2024 16:37:53 -0700 Subject: [PATCH 5/8] attempting 3.10-slim Signed-off-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> --- Dockerfile | 2 +- Dockerfile.worker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d76808b..d0ca774 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.0.0-experimental -FROM python:3.9-slim as base +FROM python:3.10-slim as base SHELL ["/bin/bash", "-c"] diff --git a/Dockerfile.worker b/Dockerfile.worker index 57130c4..770c05d 100644 --- a/Dockerfile.worker +++ b/Dockerfile.worker @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.0.0-experimental -FROM python:3.9-slim as base +FROM python:3.10-slim as base SHELL ["/bin/bash", "-c"] From 6cf1a2a829e0e535cf9c392cd0a2026cf7c638ff Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 2 May 2024 16:48:28 -0700 Subject: [PATCH 6/8] attempting 3.10-slim Signed-off-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> --- Dockerfile | 3 +++ Dockerfile.worker | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index d0ca774..02dbeca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,9 @@ EXPOSE 5000 FROM base as python-deps RUN apt-get update -qq && apt-get install -y ssh git openssl bash +# Install required system dependencies including Nginx +RUN apt-get install -y libpq-dev python3-psycopg2 mariadb-client postgresql-client +RUN apt-get install -y python3-dev default-libmysqlclient-dev build-essential RUN apt-get upgrade -y openssl bash dash # require a private key to access private github repositories diff --git a/Dockerfile.worker b/Dockerfile.worker index 770c05d..738e2d0 100644 --- a/Dockerfile.worker +++ b/Dockerfile.worker @@ -4,6 +4,8 @@ FROM python:3.10-slim as base SHELL ["/bin/bash", "-c"] RUN apt-get update -qq && apt-get install -y ssh git bash +RUN apt-get install -y libpq-dev python3-psycopg2 mariadb-client postgresql-client +RUN apt-get install -y python3-dev default-libmysqlclient-dev build-essential RUN apt-get upgrade -y bash dash # require a private key to access private github repositories From d48b17889c160337108e1b4061e680973e3add02 Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 2 May 2024 17:05:13 -0700 Subject: [PATCH 7/8] attempting 3.10-slim, upgrade wrapt Signed-off-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index acda19c..1abf055 100644 --- a/requirements.txt +++ b/requirements.txt @@ -75,5 +75,5 @@ pylint==2.6.0 pylint-flask-sqlalchemy==0.2.0 pyrsistent==0.17.3 pyyaml==5.3.1 -wrapt==1.12.1 +wrapt==1.16.0 vine==5.0.0 From 86a2db5e8484959224b54f3f7cbafcc2f626ee3d Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Thu, 2 May 2024 17:12:51 -0700 Subject: [PATCH 8/8] attempting 3.10-slim, upgrade typed-ast Signed-off-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1abf055..5eea7c5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -57,7 +57,7 @@ sqlalchemy==1.3.20 starkbank-ecdsa==1.1.0 tld==0.12.2 toml==0.10.1 -typed-ast==1.4.1 +typed-ast==1.5.5 typing-extensions==3.7.4.3 urllib3==1.25.11 werkzeug==1.0.1