python3.8 / Ubuntu Focal migration

StackStorm · Feb 12, 2022 · daabd54 · daabd54
1 parent 84036d3
commit daabd54
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/base/Dockerfile b/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:focal
 
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/base/files/.welcome.sh b/base/files/.welcome.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Get st2 version based on hardcoded string in st2common
-ST2_VERSION=$(/opt/stackstorm/st2/bin/python -c 'exec(open("/opt/stackstorm/st2/lib/python3.6/site-packages/st2common/__init__.py").read()); print(__version__)')
+ST2_VERSION=$(/opt/stackstorm/st2/bin/python -c 'exec(open("/opt/stackstorm/st2/lib/python3.8/site-packages/st2common/__init__.py").read()); print(__version__)')
 UBUNTU_VERSION=$(lsb_release -s -d)
 printf "Welcome to \033[1;38;5;208mStackStorm HA\033[0m \033[1m%s\033[0m (${UBUNTU_VERSION} %s %s)\n" "v${ST2_VERSION}" "$(uname -o)" "$(uname -m)"
 printf " * Documentation: https://docs.stackstorm.com/\n"

diff --git a/st2chatops/Dockerfile b/st2chatops/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:focal
 
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/st2web/Dockerfile b/st2web/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:focal
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -38,7 +38,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 # Install nginx
 RUN apt-key adv --keyserver hkp:https://keyserver.ubuntu.com:80 --recv-keys ABF5BD827BD9BF62 \
- && echo "deb http:https://nginx.org/packages/ubuntu/ bionic nginx" > /etc/apt/sources.list.d/nginx.list \
+ && echo "deb http:https://nginx.org/packages/ubuntu/ focal nginx" > /etc/apt/sources.list.d/nginx.list \
  && apt-get update \
  && apt-get install -y nginx \
  && rm -f /etc/apt/sources.list.d/nginx.list